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
literal 0
HcmV?d00001
diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png.meta
new file mode 100644
index 0000000000..7c5ecffdd5
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_fuzhubiao_hl.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 68aed19708f753e46bc8726539c54e25
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 56
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: e15fea532cce48b45a470968ea847472
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: PublicAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_konghzibiao_hl.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_konghzibiao_hl.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cc30c1575168c8940fb719dcf56253c45187429
GIT binary patch
literal 4526
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 1 then
_a = 1
_dr = 0
end
elseif _dr == 0 and _a > 0 then
- _a = _a - 0.02
+ _a = _a - 0.04
if _a <= 0 then
_a = 0
_dr = 1
@@ -227,7 +238,15 @@ function this.Update()
--
for render, call in pairs(_BreathList) do
- render.color = Color.New(render.color.r, render.color.g, render.color.b, _a)
+ local a = _a * 0.5 + 0.5
+ render.color = Color.New(render.color.r, render.color.g, render.color.b, a)
+ if _a == 0 and call then
+ call()
+ end
+ end
+
+ for go, call in pairs(_ScaleList) do
+ go.transform.localScale = Vector3.one * (_a * 0.5 + 1)
if _a == 0 and call then
call()
end
@@ -237,6 +256,7 @@ end
--
function this.HeroItemAdapter(_go, _heroData)
local showList = {}
+ local jobState = 0
for i, v in pairs(this.condition) do
local cc = HardStageCondition[v]
if cc then
@@ -304,10 +324,19 @@ function this.HeroItemAdapter(_go, _heroData)
if table.indexof(_heroData.heroConfig.Orientation, 7) then-- 恢复
showList[7] = 1
end
+ elseif cc.ConditionType == 7 then -- 不上阵某职业
+ if _heroData.heroConfig.Profession == ct then
+ jobState = -1
+ end
+ elseif cc.ConditionType == 11 then -- 上阵某职业
+ if _heroData.heroConfig.Profession == ct then
+ jobState = 1
+ end
end
end
end
+ -- 能力判断
local loopList = {}
for k, v in pairs(showList) do
table.insert(loopList, k)
@@ -341,6 +370,37 @@ function this.HeroItemAdapter(_go, _heroData)
this.RemoveBreath(highlight)
this.RemoveBreath(txt)
end
+
+ -- 职业图标
+ local posIcon = Util.GetGameObject(_go, "posIcon")
+ local cha = Util.GetGameObject(_go, "posCha")
+ local hl = Util.GetGameObject(_go, "posIcon/hl"):GetComponent("Image")
+ if jobState == 0 then
+ posIcon.transform.localScale = Vector3.one
+ Util.SetGray(posIcon, false)
+ cha:SetActive(false)
+ this.RemoveScale(cha)
+ this.RemoveScale(posIcon)
+ hl.gameObject:SetActive(false)
+ this.RemoveBreath(hl)
+ elseif jobState == 1 then
+ posIcon.transform.localScale = Vector3.one*1.5
+ Util.SetGray(posIcon, false)
+ cha:SetActive(false)
+ this.RemoveScale(cha)
+ this.AddScale(posIcon)
+ hl.gameObject:SetActive(true)
+ hl:GetComponent("Image").sprite = this.root.spLoader:LoadSprite(_heroData.professionIcon.."_hl")
+ this.AddBreath(hl)
+ elseif jobState == -1 then
+ posIcon.transform.localScale = Vector3.one
+ Util.SetGray(posIcon, true)
+ cha:SetActive(true)
+ this.AddScale(cha)
+ this.RemoveScale(posIcon)
+ hl.gameObject:SetActive(false)
+ this.RemoveBreath(hl)
+ end
end
return this
\ No newline at end of file
From f45ec94ea5c5df7182ac83bc95619f42bc43cc1c Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Fri, 7 Jan 2022 16:46:25 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=A1=80=E6=9D=A1=E4=BD=8D=E7=BD=AE?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
index aff949fe9a..a379c764c8 100644
--- a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
+++ b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
@@ -125027,7 +125027,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: 1, y: 270}
+ m_AnchoredPosition: {x: 1, y: 185.3}
m_SizeDelta: {x: 162, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1211737628673793467
From 963591b530ff7da66d8bb7630c2697e4861c2470 Mon Sep 17 00:00:00 2001
From: gaoxin
Date: Fri, 7 Jan 2022 18:21:10 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E5=8A=A8=E7=94=BB=E3=80=91?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=94=BB=E5=AF=BC=E8=87=B4=E9=83=A8?=
=?UTF-8?q?=E5=88=86=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 74c5a631aa..664dcf5b0a 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -30752,19 +30752,6 @@ MonoBehaviour:
loop: 0
loopType: 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}
initFloat: 0
isInit: 0