[功能]=======命石修改,建木神树修改
parent
bbde58e666
commit
57812ad22f
File diff suppressed because it is too large
Load Diff
|
@ -55,7 +55,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4633213687808411125
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -72,10 +72,10 @@ RectTransform:
|
|||
m_Father: {fileID: 1828482313430278523}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -117}
|
||||
m_SizeDelta: {x: 600, y: 234}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 385, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5084091286484917787
|
||||
CanvasRenderer:
|
||||
|
@ -784,10 +784,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4633213687808411125}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -117}
|
||||
m_SizeDelta: {x: 600, y: 174}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 385, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1017512787234966051
|
||||
MonoBehaviour:
|
||||
|
@ -5372,10 +5372,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6475116166128363344}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -37}
|
||||
m_SizeDelta: {x: 382, y: 74}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2325707849154950736
|
||||
CanvasRenderer:
|
||||
|
@ -6332,7 +6332,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 509, y: -0}
|
||||
m_AnchoredPosition: {x: 509, y: 0}
|
||||
m_SizeDelta: {x: 1018, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1973149274280526846
|
||||
|
@ -7101,7 +7101,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4209546028681882202}
|
||||
- component: {fileID: 6360147296956617736}
|
||||
- component: {fileID: 159784019866316574}
|
||||
- component: {fileID: 1748259032992781433}
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
|
@ -7123,10 +7123,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6475116166128363344}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 300, y: -124}
|
||||
m_SizeDelta: {x: 600, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 385, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &6360147296956617736
|
||||
MonoBehaviour:
|
||||
|
@ -7141,18 +7141,18 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 40
|
||||
m_Right: 0
|
||||
m_Left: 70
|
||||
m_Right: 70
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 250, y: 50}
|
||||
m_Spacing: {x: 50, y: 0}
|
||||
m_Spacing: {x: 130, y: 0}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 2
|
||||
--- !u!114 &159784019866316574
|
||||
--- !u!114 &1748259032992781433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -7161,17 +7161,11 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4902360537253194920}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
m_MinWidth: 600
|
||||
m_MinHeight: 100
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &5102170010853879747
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -11230,7 +11224,7 @@ MonoBehaviour:
|
|||
m_Spacing: 0
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 1
|
||||
--- !u!114 &1539574512763238056
|
||||
MonoBehaviour:
|
||||
|
@ -12232,7 +12226,7 @@ MonoBehaviour:
|
|||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
|
@ -12253,7 +12247,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &8772879527031137081
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -4,7 +4,7 @@ local gemConfig = ConfigManager.GetConfig(ConfigName.GemConfig)
|
|||
local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local typeName = {
|
||||
[1] = "攻击",[2] = "生命",[3] = "增伤",[4] = "减伤",[5] = "人杰",[6] = "佛禅",[7] = "妖灵",[8] = "道玄",
|
||||
[1] = "攻击",[2] = "生命",[3] = "物防",[4] = "魔抗",[5] = "人杰",[6] = "佛禅",[7] = "妖灵",[8] = "道玄",
|
||||
}
|
||||
local imgName = {
|
||||
[1] = "m_mingge_gongji",[2] = "m_mingge_shengming",[3] = "m_mingge_zengshang",[4] = "m_mingge_shanghai",
|
||||
|
@ -119,10 +119,10 @@ function Gem:SetGems()
|
|||
local gemData = GemManager.myGemList
|
||||
for i = 1, 8 do
|
||||
local itemGo = Util.GetGameObject(self.gems,"item ("..i..")")
|
||||
local nameImg = Util.GetGameObject(itemGo,"Name"):GetComponent("Image")
|
||||
local nameImg = Util.GetGameObject(itemGo,"Name"):GetComponent("Text")
|
||||
local redPoint = Util.GetGameObject(itemGo,"RedPoint")
|
||||
self.lightList[i] = Util.GetGameObject(itemGo,"Light")
|
||||
nameImg.sprite = self.spLoader:LoadSprite(imgName[i])
|
||||
nameImg.text = typeName[i]
|
||||
redPoint:SetActive(false)
|
||||
for j = 1, 3 do
|
||||
local stoneGo = Util.GetGameObject(itemGo,"stone ("..j..")")
|
||||
|
@ -257,7 +257,13 @@ function Gem:SetProperty(configData,data,parent,text)
|
|||
self.propertyList[parent][j] = item
|
||||
end
|
||||
item:SetActive(true)
|
||||
item:GetComponent("Text").text = string.format( "%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
|
||||
local str=""
|
||||
if PropertyConfig[data[1]].Style==1 then
|
||||
str=string.format( "全体神将%s+%s",PropertyConfig[data[1]].Info,data[2])
|
||||
elseif PropertyConfig[data[1]].Style==2 then
|
||||
str=string.format( "全体神将%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
|
||||
end
|
||||
item:GetComponent("Text").text = str -- string.format( "%s+%s",PropertyConfig[data[1]].Info,data[2]/100).."%"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -45,7 +45,13 @@ function this:Refresh()
|
|||
self.itemList[value.id] = go
|
||||
end
|
||||
go:SetActive(true)
|
||||
go:GetComponent("Text").text = string.format("%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
|
||||
local str=""
|
||||
if propertyConfig[value.id].Style==1 then
|
||||
str=string.format( "全体神将%s+%s",propertyConfig[value.id].Info,value.num)
|
||||
elseif propertyConfig[value.id].Style==2 then
|
||||
str=string.format( "全体神将%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
|
||||
end
|
||||
go:GetComponent("Text").text = str--string.format("%s+%s",propertyConfig[value.id].Info,value.num/100).."%"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -322,19 +322,21 @@ function SacredTreePanel:OnShow()
|
|||
self.attriNum.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels
|
||||
--设置中间属性
|
||||
self:SetAttriDetail()
|
||||
self:ResetDetailPos()
|
||||
end
|
||||
|
||||
|
||||
function SacredTreePanel:SetAttriDetail()
|
||||
local curSelectIndex = self.selectIndex
|
||||
if curTreeLevel <= 0 then
|
||||
self.attriDetail:SetActive(false)
|
||||
self.selectMask:SetActive(false)
|
||||
self.jtBtn:SetActive(false)
|
||||
else
|
||||
-- if curTreeLevel <= 0 then
|
||||
-- self.attriDetail:SetActive(false)
|
||||
-- self.selectMask:SetActive(false)
|
||||
-- self.jtBtn:SetActive(false)
|
||||
-- else
|
||||
self.attriDetail:SetActive(true)
|
||||
self.selectMask:SetActive(true)
|
||||
self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0 and SacredTreeManager.CulAttri() < #attriConfig.PropertyUnlcokLevels )
|
||||
self.jtBtn:SetActive(false)
|
||||
--self.jtBtn:SetActive(SacredTreeManager.CulAttri() > 0 and SacredTreeManager.CulAttri() < #attriConfig.PropertyUnlcokLevels )
|
||||
-- self.title.text = GetStringByEquipQua(curSelectIndex+1,QualityNameDef[curSelectIndex+1].."宝物神应属性")
|
||||
self.title.text = string.format("<color=%s>%s宝物神应属性</color>",COLOR[curSelectIndex],QualityNameDef[curSelectIndex+1])
|
||||
local data = SacredTreeManager.GetAttriDetail(curSelectIndex)
|
||||
|
@ -354,7 +356,7 @@ function SacredTreePanel:SetAttriDetail()
|
|||
Util.GetGameObject(go,"nextAttri"):GetComponent("Text").text = value.text2
|
||||
end
|
||||
self:InitDetailPos()
|
||||
end
|
||||
--end
|
||||
end
|
||||
|
||||
function SacredTreePanel:InitDetailPos()
|
||||
|
@ -370,6 +372,7 @@ function SacredTreePanel:InitDetailPos()
|
|||
end
|
||||
|
||||
function SacredTreePanel:ResetDetailPos()
|
||||
self.bool=false
|
||||
local length = self.bool and 170 + SacredTreeManager.CulAttri()*50 or 170 + #attriConfig.PropertyUnlcokLevels*50
|
||||
local size = Vector2.New(1080,length)
|
||||
local rotation = self.bool and 0 or 179
|
||||
|
|
Loading…
Reference in New Issue