From 33bbaf3cf9145e91e33516c6ff59ced56212e9dd Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Fri, 13 Aug 2021 13:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E9=A2=84?=
=?UTF-8?q?=E8=A7=88=E5=A2=9E=E5=8A=A0=E6=98=9F=E6=95=B0=EF=BC=8C=E9=AD=82?=
=?UTF-8?q?=E7=81=B5=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../UI/GeneralPanel/GeneralBigPopup.prefab | 156 ++++++++++++++++++
.../GeneralBigPopup_PracticeStatePreview.lua | 14 ++
.../RoleInfo/RoleEquipTreasureChangePopup.lua | 5 +-
3 files changed, 173 insertions(+), 2 deletions(-)
diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 5d325290e7..d4ee55c0aa 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -5043,6 +5043,86 @@ MonoBehaviour:
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &2854168830860709693
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2794461961453412777}
+ - component: {fileID: 7009010040367424077}
+ - component: {fileID: 757626557383606599}
+ m_Layer: 0
+ m_Name: Star
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2794461961453412777
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -93.25}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4250835300878011901}
+ m_RootOrder: 1
+ 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: 312, y: 0}
+ m_SizeDelta: {x: 136.09998, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7009010040367424077
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ m_CullTransparentMesh: 0
+--- !u!114 &757626557383606599
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2854168830860709693}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.97647065, g: 0.7607844, b: 0.5058824, 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_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 40
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u9700\u898130"
+ LanguageIndex: 0
--- !u!1 &2919348480456994023
GameObject:
m_ObjectHideFlags: 0
@@ -8155,6 +8235,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5208191871158868198
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3827739693979613605}
+ - component: {fileID: 4742467671142405772}
+ - component: {fileID: 2489786142445598379}
+ m_Layer: 0
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3827739693979613605
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ 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: 4250835300878011901}
+ m_RootOrder: 2
+ 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: 417, y: 0}
+ m_SizeDelta: {x: 72, y: 70}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4742467671142405772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ m_CullTransparentMesh: 0
+--- !u!114 &2489786142445598379
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5208191871158868198}
+ 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: 8908080ead3926f4e9e9951397b9e29b, 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 &5356778114707042482
GameObject:
m_ObjectHideFlags: 0
@@ -12433,6 +12587,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2313678692522721823}
+ - {fileID: 2794461961453412777}
+ - {fileID: 3827739693979613605}
m_Father: {fileID: 1126952660353491259}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
index 8e2131a646..ad0a72497a 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua
@@ -52,6 +52,8 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
local specialText = Util.GetGameObject(_go,"SpecialText"):GetComponent("Text")
local textPre = Util.GetGameObject(_go,"Content/Text")
local content = Util.GetGameObject(_go,"Content")
+ local star = Util.GetGameObject(_go,"title/Star"):GetComponent("Text")
+ local starImg = Util.GetGameObject(_go,"title/Image")
if not self.textList[_go] then
self.textList[_go] = {}
end
@@ -102,6 +104,18 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
specialText.gameObject:SetActive(false)
end
title.text = string.format("%s期",_data.RealmName)
+ if _data.NeedStarNum ~= 0 then
+ star.gameObject:SetActive(true)
+ starImg.gameObject:SetActive(true)
+ if _data.NeedStarNum > PracticeManager.StarNum then
+ star.text = string.format("需要%s",_data.NeedStarNum)
+ else
+ star.text = string.format("需要%s",_data.NeedStarNum)
+ end
+ else
+ star.gameObject:SetActive(false)
+ starImg.gameObject:SetActive(false)
+ end
ForceRebuildLayout(_go.transform)
_go:SetActive(true)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
index 29a8e37d6b..d51166efa5 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
@@ -196,6 +196,7 @@ function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_
position = _position--treelv
end
function RoleEquipTreasureChangePopup:OnShow()
+ Log("openType:"..tostring(type))
--初始化
for i = 1, 2 do
this.treasurePanel[i].bg:SetActive(false)
@@ -223,8 +224,8 @@ function RoleEquipTreasureChangePopup:OnShow()
this.treasurePanel[1].EquipBtns:SetActive((type == 1) or (type == 2))
this.treasurePanel[2].EquipBtns:SetActive(type == 3)
this.treasurePanel[1].EquipBtnAdd:SetActive(type == 1)
- this.treasurePanel[1].EquipBtnStrong:SetActive(type == 1 or (type == 2) or (type == 4))
- this.treasurePanel[1].EquipBtnRefine:SetActive(type == 1 or (type == 2) or (type == 4))
+ this.treasurePanel[1].EquipBtnStrong:SetActive((type == 2) or (type == 4))
+ this.treasurePanel[1].EquipBtnRefine:SetActive((type == 2) or (type == 4))
this.treasurePanel[1].EquipBtnRemove:SetActive((type == 2) or (type == 4))
this.curEquipSign.gameObject:SetActive(type == 3)