礼物修改提交

dev_one_discount
wangzhenxing 2023-09-15 14:11:14 +08:00
parent 049cebd574
commit acdb5a21cd
8 changed files with 279 additions and 53 deletions

View File

@ -5235,7 +5235,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
@ -6029,7 +6029,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 452.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2554803388262030902
@ -6105,7 +6105,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 452.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5866162819780746943
@ -12164,7 +12164,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 452.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4344551565155943692
@ -12310,7 +12310,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 467.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 875, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4810471742097366472
@ -12905,7 +12905,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 467.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 875, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3252014967305954959
@ -13106,7 +13106,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 442.9, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 825.8, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &3639955869606220467
@ -13575,7 +13575,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 460, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5201084322800259043
@ -14125,7 +14125,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 452.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 905, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7059021513111261155
@ -14787,7 +14787,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 467.50003, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 875, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9192745376153644239

View File

@ -307,7 +307,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2025577927577701619
RectTransform:
m_ObjectHideFlags: 0
@ -31550,6 +31550,7 @@ GameObject:
- component: {fileID: 279390374401093025}
- component: {fileID: 4555280311240747089}
- component: {fileID: 7238072003691962153}
- component: {fileID: 1178982412285120275}
m_Layer: 5
m_Name: collectImg
m_TagString: Untagged
@ -31613,6 +31614,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &1178982412285120275
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398072288757924387}
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: 1
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: 7238072003691962153}
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 &6619523023986096203
GameObject:
m_ObjectHideFlags: 0
@ -31646,8 +31689,8 @@ 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: 0.8, y: -549.6}
m_SizeDelta: {x: 950.7, y: 350.8}
m_AnchoredPosition: {x: 0.8, y: -431.30994}
m_SizeDelta: {x: 950.7, y: 587.38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4653632222553070112
CanvasRenderer:
@ -36869,8 +36912,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 522, y: -355}
m_SizeDelta: {x: 6, y: -1176.17}
m_AnchoredPosition: {x: 522, y: -426.31}
m_SizeDelta: {x: 6, y: -1318.85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1248130864413631210
CanvasRenderer:

View File

@ -699,6 +699,7 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
starPre:GetComponent("LayoutGroup").spacing = scale
starPre:GetComponent("RectTransform").pivot = pivot
starPre.transform:GetChild(0).gameObject:SetActive(false)
LogError("star============="..star.." type=========="..type)
if star < 7 and type and type == 3 then
starPre.transform:GetChild(0).gameObject:SetActive(true)
for i = 2, 24 do

View File

@ -291,14 +291,18 @@ function this.CalculateEquipWarForce(curEquip)
local id = prop.propertyId
local value = prop.propertyValue
--
if propertyConfig[id].Style == 2 then
value = value / 100
end
if addAllProVal[id] then
addAllProVal[id] = addAllProVal[id] + value
else
addAllProVal[id] = value
if id~=0 and id~=nil then
LogError("id==========="..id)
if propertyConfig[id].Style == 2 then
value = value / 100
end
if addAllProVal[id] then
addAllProVal[id] = addAllProVal[id] + value
else
addAllProVal[id] = value
end
end
end
if curEquip and curEquip.Score > 0 then
addAllProVal[HeroProType.WarPower] = curEquip.Score
@ -464,12 +468,37 @@ end
function this.GetMainProList(equipConfig)
local propList = {}
for index, prop in ipairs(equipConfig.Property) do
propList[index] = {}
propList[index].propertyId = prop[1]
propList[index].propertyValue = prop[2]
propList[index].PropertyConfig = propertyConfig[prop[1]]
if equipConfig.Property and #equipConfig.Property>0 then
for index, prop in ipairs(equipConfig.Property) do
-- propList[index] = {}
-- propList[index].propertyId = prop[1]
-- propList[index].propertyValue = prop[2]
-- propList[index].PropertyConfig = propertyConfig[prop[1]]
if tonumber(prop[1])~=0 and tonumber(prop[1])~=nil then
local data={}
data.propertyId=prop[1]
data.propertyValue = prop[2]
data.PropertyConfig = propertyConfig[prop[1]]
table.insert(propList,data)
end
end
end
local len=#equipConfig.Property
if equipConfig.PlayerProperty then
for index, prop in ipairs(equipConfig.PlayerProperty) do
if tonumber(prop[1])~=0 and tonumber(prop[1])~=nil then
local data={}
data.propertyId=prop[1]
data.propertyValue = prop[2]
data.PropertyConfig = propertyConfig[prop[1]]
table.insert(propList,data)
end
end
end
return propList
end

View File

@ -82,8 +82,89 @@ end
function this.changeGiftsByType(_type,_list)
end
--获取英雄礼物增加的属性
function this.GetHeroGiftAddPro(_id)
local data={}
if not this.allHeroGifts[_id] then
return data
end
for i=1,#this.allHeroGifts do
local id=this.allHeroGifts[i]
local pro = equipConfig[id].Property
if pro and #pro>0 then
for k = 1, #pro do
local key=pro[k][1]
local value=pro[k][2]
if tonumber(key)~=0 and tonumber(key)~=nil then
if not data[key] then
data[key] = 0
end
data[key] = data[key] + value
end
end
end
--英雄礼物不会加成主角属性
-- local pro2 = equipConfig[id].PlayerProperty
-- if pro2 and #pro2>0 then
-- for k = 1, #pro2 do
-- if not data[pro2[k][1]] then
-- data[pro2[k][1]] = 0
-- end
-- data[pro2[k][1]] = data[pro2[k][1]] + pro2[k][2]
-- end
-- end
end
return data
end
--获取主角礼物增加的属性
function this.GetPlayerGiftAddPro()
local data={}
-- if #this.playerGifts==0 then
-- return data
-- end
for i=1,#this.playerGifts do
local id=this.playerGifts[i]
local pro = equipConfig[id].PlayerProperty
if pro and #pro>0 then
for k = 1, #pro do
local key=pro[k][1]
local value= pro[k][2]
if tonumber(key) ~=nil and tonumber(key)~=0 then
if key~=0 and key~=nil then
if not data[key] then
data[key] = 0
end
data[key] = data[key] + value
end
end
end
end
local pro2 = equipConfig[id].Property
if pro2 and #pro2>0 and pro2[1][1]~=0 and pro2[1][1]~=nil then
for k = 1, #pro2 do
local key=pro2[k][1]
local value=pro2[k][2]
if tonumber(key) ~=nil and tonumber(key)~=0 then
if not data[key] then
data[key] = 0
end
if value and value~=0 then
LogError("pro2[k][1]==="..key.." value=="..value)
data[key] = data[key] + value
end
end
end
end
end
return data
end
function this.CheckGemRed()
return false

View File

@ -20,6 +20,7 @@ Func_Prop_Type = {
Gem = 17, --命格
Weapon =18, --神兵
WeaponFetter=19, --神兵羁绊
Gift =20, --礼物
}
-- 计算需要缓存数据的方法
@ -114,8 +115,16 @@ Func_Prop_Func = {
-- 命格
[Func_Prop_Type.Gem] = function()
local allPro = GemNewManager.GetAllAttri()
-- for k, v in pairs(allPro) do
-- LogError("命石 k===="..k.." v=="..v)
-- end
return allPro
end,
-- 礼物
[Func_Prop_Type.Gift] = function()
local allPro = GiftManager.GetPlayerGiftAddPro()
for k, v in pairs(allPro) do
LogError("命石 k===="..k.." v=="..v)
LogError("主角礼物 k====".. k .." v==".. v)
end
return allPro
end,

View File

@ -22,6 +22,7 @@ Hero_Prop_Type = {
TailsManSou = 10, -- 法宝之魂
GodPrint = 11, --神印
FaXiang= 12, --法相
Gift = 13, --礼物
}
@ -183,15 +184,18 @@ Hero_Prop_Func = {
for index, prop in ipairs(curEquip.mainAttribute) do
local id = prop.propertyId
local value = prop.propertyValue
if addAllProVal[id] then
addAllProVal[id] = addAllProVal[id] + value
else
addAllProVal[id] = value
end
if propertyConfig[id].Style == 1 then--摘星阁加持
--LogError("addlevel=="..HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position))
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000)
if id~=0 and id~=nil then
if addAllProVal[id] then
addAllProVal[id] = addAllProVal[id] + value
else
addAllProVal[id] = value
end
if propertyConfig[id].Style == 1 then--摘星阁加持
--LogError("addlevel=="..HomeLandManager.LevelToValue(curEquip.homeEquipLv,curEquip.position))
addAllProVal[id] = addAllProVal[id] + math.ceil(addAllProVal[id] * HomeLandManager.GetHeroEquipPropAdd(_heroData.dId,curEquip.position)/10000)
end
end
end
end
end
@ -578,7 +582,11 @@ Hero_Prop_Func = {
local SingleProVal, AllHeroProVal = LikabilityManager.GetTotalForce(_heroData)
return SingleProVal
end,
--礼物
[Hero_Prop_Type.Gift] =function(_heroData)
local addPro=GiftManager.GetHeroGiftAddPro(_heroData.dId)
return addPro
end,
[Hero_Prop_Type.GodSoul] = function(_heroData)
local propList, conPropList, teamPropList, conTeamPropList, dePropList
local SingleProVal = GodSoulManager.GetHeroGodSoulDatas(_heroData.dId,_heroData.tId, _heroData.godSoulLv)

View File

@ -332,25 +332,80 @@ function RewardEquipSingleShowPopup2:OnShow()
pro:SetActive(false)
end
local num = 0
for index, prop in ipairs(equipConfigData.Property) do
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
num = num + 1
--基础属性
if not _BaseProList[num] then
_BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[num]:SetActive(true)
_BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
else
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
for i=1,#equipConfigData.Property do
local prop=equipConfigData.Property[i]
if tonumber(prop[1])~=nil then
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
num = num + 1
--基础属性
if not _BaseProList[num] then
_BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[num]:SetActive(true)
if equipConfigData.Position==7 then
_BaseProList[num]:GetComponent("Text").text ="全体神将"..GetLanguageStrById(proConfigData.Info)
else
_BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
end
local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
else
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
end
end
end
end
for i=1,#equipConfigData.PlayerProperty do
local prop=equipConfigData.PlayerProperty[i]
if tonumber(prop[1])~=nil then
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
num = num + 1
--基础属性
if not _BaseProList[num] then
_BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[num]:SetActive(true)
_BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
else
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
end
end
end
end
-- for index, prop in ipairs(equipConfigData.PlayerProperty) do
-- LogError("prop[1]=========="..prop[1])
-- if tonumber(prop[1]~=nil) then
-- local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
-- if proConfigData then
-- num = num + 1
-- --基础属性
-- if not _BaseProList[num] then
-- _BaseProList[num] = newObjToParent(self.baseProPre, self.baseProGrid)
-- end
-- _BaseProList[num]:SetActive(true)
-- _BaseProList[num]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
-- local vText = Util.GetGameObject(_BaseProList[num], "curProVale"):GetComponent("Text")
-- -- Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text").text = ""--摘星阁加持文字显示位置
-- if prop[2] > 0 then
-- vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
-- else
-- vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
-- end
-- end
-- end
-- end
if equipConfigData.Quality == 6 then
local prop = equipConfigData.PropertyMin
local proConfigData = ConfigManager.TryGetConfigData(ConfigName.PropertyConfig, prop[1])