神兵技能信息预设修改提交

dev_chengFeng
wangzhenxing 2023-03-30 13:11:09 +08:00
parent 207c1f3426
commit a753de6a59
7 changed files with 5407 additions and 9 deletions

View File

@ -5359,8 +5359,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 22.2} m_AnchoredPosition: {x: -3.8, y: 20}
m_SizeDelta: {x: 80, y: 80} m_SizeDelta: {x: 69, y: 69}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3865184907186740080 --- !u!222 &3865184907186740080
CanvasRenderer: CanvasRenderer:
@ -6002,8 +6002,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 22.2} m_AnchoredPosition: {x: -3.8, y: 20}
m_SizeDelta: {x: 80, y: 80} m_SizeDelta: {x: 69, y: 69}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4313834099472813200 --- !u!222 &4313834099472813200
CanvasRenderer: CanvasRenderer:
@ -7275,7 +7275,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 &5304387997343348593 --- !u!224 &5304387997343348593
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2f31c7c8e6126654eababc24d5a59d24
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -376,6 +376,7 @@ BattleUnitType = {
Role = 1, Role = 1,
Monster = 2, Monster = 2,
Player = 3, Player = 3,
Weapon = 4, --武器
} }
BattleRoleElementType = { BattleRoleElementType = {

View File

@ -168,8 +168,8 @@ end
--界面关闭时调用(用于子类重写) --界面关闭时调用(用于子类重写)
function GodWeaponGetInfoPopup:OnClose() function GodWeaponGetInfoPopup:OnClose()
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO) -- poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
this.testLiveGO = nil --this.testLiveGO = nil
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)

View File

@ -103,7 +103,7 @@ function this.OnClickTabBtn(_curIndex)
this.ScrollParentView2:SetActive(true) this.ScrollParentView2:SetActive(true)
pokemonChipList = BagManager.GetDataByItemType(ItemType.GodWeaponChip) pokemonChipList = BagManager.GetDataByItemType(ItemType.GodWeaponChip)
this.PokemonChipDataSort(pokemonChipList) this.PokemonChipDataSort(pokemonChipList)
if redPointList[1] and redPointList[2].gameObject then if redPointList[1] then
redPointList[1]:SetActive(GodWeaponManager.WeaponChipCompoundRedPoint()) redPointList[1]:SetActive(GodWeaponManager.WeaponChipCompoundRedPoint())
end end
for key, value in pairs(this.ChipItemList) do for key, value in pairs(this.ChipItemList) do

View File

@ -497,7 +497,7 @@ function this.FormationAdapter(teamInfo)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(this.Weapons[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality)) Util.GetGameObject(this.Weapons[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality))
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(heroConfig.Icon)) Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(heroConfig.Icon))
local frameBtn = Util.GetGameObject(this.Weapons[i], "frame") local frameBtn = Util.GetGameObject(this.Weapons[hero.position], "frame")
local heroData = {} local heroData = {}
Util.AddOnceClick(frameBtn, function() Util.AddOnceClick(frameBtn, function()
local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level} local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}