diff --git a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
index 93f02d49d3..273da6be2f 100644
--- a/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/SacredTree/SacredTreePanel.prefab
@@ -677,7 +677,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6961839936357821033}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1611,7 +1611,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0, a: 1}
+ m_Color: {r: 0.7764706, g: 0.3882353, b: 0.4, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -1972,7 +1972,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6961839936357821033}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -2838,7 +2838,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 1, b: 0, a: 1}
+ m_Color: {r: 0.32156864, g: 0.5921569, b: 0.39215687, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2858,7 +2858,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u7EA2\u8272\u5B9D\u7269"
+ m_Text: "\u7EFF\u8272\u5B9D\u7269"
LanguageIndex: 0
--- !u!114 &2744153571399756853
MonoBehaviour:
@@ -3078,7 +3078,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 1, a: 1}
+ m_Color: {r: 0.3882353, g: 0.59607846, b: 0.7882353, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -3098,7 +3098,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u7EA2\u8272\u5B9D\u7269"
+ m_Text: "\u84DD\u8272\u5B9D\u7269"
LanguageIndex: 0
--- !u!114 &1823675807082579097
MonoBehaviour:
@@ -3355,7 +3355,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.7909454, b: 0, a: 1}
+ m_Color: {r: 0.9882353, g: 0.69803923, b: 0.30588236, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -3623,7 +3623,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6961839936357821033}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -3852,7 +3852,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6961839936357821033}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -4129,7 +4129,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 1, a: 1}
+ m_Color: {r: 0.5764706, g: 0.34509805, b: 0.7411765, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -4224,7 +4224,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6961839936357821033}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -4405,6 +4405,80 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &6960769041461934166
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2853275196061139364}
+ - component: {fileID: 5145713726631211692}
+ - component: {fileID: 7365814524658874698}
+ m_Layer: 0
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2853275196061139364
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6960769041461934166}
+ 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: 6961839936357821033}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: -31, y: -43}
+ m_SizeDelta: {x: 400, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5145713726631211692
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6960769041461934166}
+ m_CullTransparentMesh: 0
+--- !u!114 &7365814524658874698
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6960769041461934166}
+ 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: 288461e87c49b6d4eb6b055d683d345c, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &7043505097657033965
GameObject:
m_ObjectHideFlags: 0
@@ -4637,6 +4711,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 2853275196061139364}
- {fileID: 1304468978058557664}
- {fileID: 6941979466350970428}
- {fileID: 5752635875388809247}
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
index 5dd1b48aac..be66ac0d73 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua
@@ -176,7 +176,8 @@ function this.GetAttriDetail(index)
data[i].text2 = string.format("+%s",color2,(configNextData.Property[i][2] - configData.Property[i][2])/100).."%"
end
else
- data[i].text2 = "已达上限"
+ local color = this.treeLevel >= maxSacredLevel and "A0A0A0" or "F3D98F"
+ data[i].text2 = string.format("已达上限",color)
end
-- LogGreen(data[i].text1.." "..data[i].text2)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
index 81e29305b9..c3ea19ddbd 100644
--- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua
@@ -208,35 +208,57 @@ function SacredTreePanel:BindEvent()
end)
for i = 1, 5 do
Util.AddClick(self.selectList[i].btn1, function()
+ if lastSelect == self.selectIndex then
+ return
+ end
for j = 1, 5 do
self.selectList[j].select:SetActive(false)
end
self.selectList[i].select:SetActive(true)
self.selectIndex = Trans[i]
PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i])
+ self.selectMask:SetActive(false)
+ lastSelect = self.selectIndex
+ for index, value in ipairs(self.attriList) do
+ value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function ()
+ self.playAni = true
+ self:SetAttriDetail()
+ end)
+ end
end)
Util.AddClick(self.selectList[i].btn2, function()
+ if lastSelect == self.selectIndex then
+ return
+ end
for j = 1, 5 do
self.selectList[j].select:SetActive(false)
end
self.selectList[i].select:SetActive(true)
self.selectIndex = Trans[i]
PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",Trans[i])
+ self.selectMask:SetActive(false)
+ lastSelect = self.selectIndex
+ for index, value in ipairs(self.attriList) do
+ value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function ()
+ self.playAni = true
+ self:SetAttriDetail()
+ end)
+ end
end)
end
- Util.AddClick(self.selectMask, function()
- self.selectMask:SetActive(false)
- if lastSelect == self.selectIndex then
- return
- end
- lastSelect = self.selectIndex
- for index, value in ipairs(self.attriList) do
- value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function ()
- self.playAni = true
- self:SetAttriDetail()
- end)
- end
- end)
+ -- Util.AddClick(self.selectMask, function()
+ -- self.selectMask:SetActive(false)
+ -- if lastSelect == self.selectIndex then
+ -- return
+ -- end
+ -- lastSelect = self.selectIndex
+ -- for index, value in ipairs(self.attriList) do
+ -- value.transform:DORotate(Vector3.New(90,0,0),0.3):OnComplete(function ()
+ -- self.playAni = true
+ -- self:SetAttriDetail()
+ -- end)
+ -- end
+ -- end)
BindRedPointObject(RedPointType.Sacred,self.treeRed)
FixedUpdateBeat:Add(self.OnUpdate, self)--长按方法注册
@@ -259,7 +281,6 @@ end
function SacredTreePanel:OnOpen()
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.SacredTree})
- LogRed("Uid:"..tostring(PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect")))
if PlayerPrefs.GetInt(PlayerManager.uid.."SacredQualitySelect") == 0 then
PlayerPrefs.SetInt(PlayerManager.uid.."SacredQualitySelect",5)
end
@@ -317,7 +338,8 @@ function SacredTreePanel:SetAttriDetail()
self.attriDetail:SetActive(true)
self.selectMask:SetActive(true)
self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0)
- self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1])
+ self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性")
+ -- self.title.text = string.format("%s宝物神应属性",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1])
local data = SacredTreeManager.GetAttriDetail(curSelectIndex)
for index, value in ipairs(data) do
local go = self.attriList[index]