xiyou_sanguo
parent
d5a62204e5
commit
723b02e76d
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -120,7 +120,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 393, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7321926799232025417
|
||||
|
|
@ -144,13 +144,11 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.10980392, g: 0.78431374, b: 0.3254902, a: 1}
|
||||
m_Color: {r: 0.4745098, g: 0.38039216, b: 0.31764707, 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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 34
|
||||
|
|
@ -229,8 +227,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 34
|
||||
|
|
@ -309,8 +305,6 @@ MonoBehaviour:
|
|||
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: 0f7579036915c65459a15fae41f1c712, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -444,8 +438,6 @@ MonoBehaviour:
|
|||
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: bd924e4cc5106cc4d9954033f40bb316, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -555,8 +547,6 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -741,8 +731,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 36
|
||||
|
|
@ -857,8 +845,6 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -908,8 +894,6 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &3404077415060688902
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -973,8 +957,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 32
|
||||
|
|
@ -1054,8 +1036,6 @@ MonoBehaviour:
|
|||
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: 19d5542f3ad36154883cfc2022d17e0a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1301,7 +1281,7 @@ MonoBehaviour:
|
|||
m_CellSize: {x: 250, y: 50}
|
||||
m_Spacing: {x: 150, y: 0}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 2
|
||||
m_ConstraintCount: 1
|
||||
--- !u!114 &8436922354153951641
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1380,8 +1360,6 @@ MonoBehaviour:
|
|||
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: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1431,8 +1409,6 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &4817507879309521849
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1497,8 +1473,6 @@ MonoBehaviour:
|
|||
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: b44f71f84aa20084a9ed3a8ef44c483c, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1571,8 +1545,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 37
|
||||
|
|
@ -1651,8 +1623,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 40
|
||||
|
|
@ -1701,8 +1671,8 @@ RectTransform:
|
|||
m_Father: {fileID: 6594472603124481167}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 442.9, y: 0}
|
||||
m_SizeDelta: {x: 825.8, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
|
|
@ -1815,8 +1785,6 @@ MonoBehaviour:
|
|||
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: c631863816651274abd68bcc2fe42c9c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -1889,8 +1857,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 34
|
||||
|
|
@ -1940,9 +1906,9 @@ RectTransform:
|
|||
m_Father: {fileID: 5981932543035177726}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 460, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 460, y: -355}
|
||||
m_SizeDelta: {x: 905, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &5201084322800259043
|
||||
|
|
@ -2045,8 +2011,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 36
|
||||
|
|
@ -2186,8 +2150,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 44
|
||||
|
|
@ -2267,8 +2229,6 @@ MonoBehaviour:
|
|||
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: 19d5542f3ad36154883cfc2022d17e0a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
@ -2363,8 +2323,6 @@ MonoBehaviour:
|
|||
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: 0a607ef861fe8a24e9c6079e935099b8, type: 3}
|
||||
m_FontSize: 34
|
||||
|
|
@ -2501,8 +2459,6 @@ MonoBehaviour:
|
|||
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: 977f8ef10a1f1414f8002a3b37d8dd0d, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ function this.GetPropText(_treeLv, _type)
|
|||
local propArr = configData.Property[i]
|
||||
local propId = propArr[1]
|
||||
data[propId] = {}
|
||||
data[propId].propId = propId
|
||||
data[propId].currValue = propArr[2]
|
||||
data[propId].floor = becomAGodSettingData.Floor[k]
|
||||
if configNextData then
|
||||
|
|
@ -216,8 +217,33 @@ function this.GetPropText(_treeLv, _type)
|
|||
isMax = true
|
||||
end
|
||||
end
|
||||
for i = 1, #configData.SystemProperty do
|
||||
local propArr = configData.SystemProperty[i]
|
||||
local propId = propArr[1] * 10000
|
||||
if propId > 0 then
|
||||
data[propId] = {}
|
||||
data[propId].propId = propId
|
||||
data[propId].currValue = propArr[2]
|
||||
data[propId].floor = becomAGodSettingData.Floor[k]
|
||||
if configNextData then
|
||||
local nextPropArr = configNextData.SystemProperty[i]
|
||||
data[propId].nextValue = nextPropArr[2]
|
||||
else
|
||||
local color = not bool and "A0A0A0" or "F3D98F"
|
||||
data[propId].nextValue = string.format(Language[12789], color)
|
||||
isMax = true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return data, isMax
|
||||
list = {}
|
||||
for key, value in pairs(data) do
|
||||
table.insert(list, value)
|
||||
end
|
||||
table.sort(list, function(a, b)
|
||||
return a.floor < b.floor
|
||||
end)
|
||||
return list, isMax
|
||||
end
|
||||
|
||||
function this.CheckRedPoint_1()
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ function BecomeAGodPanel:InitComponent()
|
|||
this.btnTupoDes = Util.GetGameObject(this.bg2, "TupoDesBtn")
|
||||
this.TupoDesPanel = Util.GetGameObject(self.transform, "TianfuDes")
|
||||
--this.titleTxt.text = Language[10985]
|
||||
this.titleTxt.text = "六道成神"
|
||||
this.titleTxt.text = "神觉"
|
||||
this.btnLvup = Util.GetGameObject(this.bg2, "Lvup")
|
||||
self.btnLvupRed = Util.GetGameObject(this.bg2, "Lvup/red")
|
||||
BindRedPointObject(RedPointType.BecomeAGodUpgrade, self.btnLvupRed)
|
||||
|
|
|
|||
|
|
@ -112,13 +112,14 @@ end
|
|||
|
||||
--设置属性的显示
|
||||
function BecomeAGodPropertyPanel:SetPropertyShow(_infos)
|
||||
local index = 1
|
||||
--local index = 1
|
||||
this.properList[0].go.gameObject:SetActive(true)
|
||||
for i = 1, #this.properList do
|
||||
this.properList[i].go.gameObject:SetActive(false)
|
||||
end
|
||||
local floor = GodsWayTowerManager.GetTowerFloorByType(3)
|
||||
for key, value in pairs(_infos) do
|
||||
for index = 1, #_infos do
|
||||
--for key, value in pairs(_infos) do
|
||||
if not this.properList[index] then
|
||||
this.properList[index] = {}
|
||||
this.properList[index].go = newObjToParent(this.properItemPre, this.propertyGrid)
|
||||
|
|
@ -131,26 +132,48 @@ function BecomeAGodPropertyPanel:SetPropertyShow(_infos)
|
|||
"Text")
|
||||
end
|
||||
this.properList[index].go.gameObject:SetActive(true)
|
||||
local proper = ConfigManager.GetConfigData(ConfigName.PropertyConfig, key)
|
||||
if proper.Style == 1 then
|
||||
this.properList[index].leftTxt.text = string.format("%s+%s", GetLanguageStrById(proper.Info), value
|
||||
.currValue)
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or value.nextValue
|
||||
if _infos[index].propId == 10000 then
|
||||
this.properList[index].leftTxt.text = string.format("%s+%s", "神兽属性",
|
||||
(_infos[index]
|
||||
.currValue / 100) .. "%")
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or (_infos[index].nextValue / 100) ..
|
||||
"%"
|
||||
elseif _infos[index].propId == 20000 then
|
||||
this.properList[index].leftTxt.text = string.format("%s+%s", "身外化身属性",
|
||||
(_infos[index]
|
||||
.currValue / 100) .. "%")
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or (_infos[index].nextValue / 100) ..
|
||||
"%"
|
||||
elseif _infos[index].propId == 30000 then
|
||||
this.properList[index].leftTxt.text = string.format("%s+%s", "神器属性",
|
||||
(_infos[index]
|
||||
.currValue / 100) .. "%")
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or (_infos[index].nextValue / 100) ..
|
||||
"%"
|
||||
else
|
||||
this.properList[index].leftTxt.text = GetLanguageStrById(proper.Info) .. "+" .. value.currValue / 100 .. "%"
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or value.nextValue / 100 .. "%"
|
||||
local proper = ConfigManager.GetConfigData(ConfigName.PropertyConfig, _infos[index].propId)
|
||||
if proper.Style == 1 then
|
||||
this.properList[index].leftTxt.text = string.format("%s+%s", GetLanguageStrById(proper.Info),
|
||||
_infos[index]
|
||||
.currValue)
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or _infos[index].nextValue
|
||||
else
|
||||
this.properList[index].leftTxt.text = GetLanguageStrById(proper.Info) ..
|
||||
"+" .. _infos[index].currValue / 100 .. "%"
|
||||
this.properList[index].rightTxt.text = this.isMax and Language[10209] or
|
||||
_infos[index].nextValue / 100 .. "%"
|
||||
end
|
||||
end
|
||||
if floor >= value.floor then
|
||||
if floor >= _infos[index].floor then
|
||||
this.properList[index].Lock:SetActive(false)
|
||||
this.properList[index].leftTxt.color = UIColor.WRITE
|
||||
this.properList[index].rightTxt.color = UIColor.GREEN
|
||||
else
|
||||
this.properList[index].Lock:SetActive(true)
|
||||
this.properList[index].LockText.text = "(神塔" .. value.floor .. "层解锁)"
|
||||
this.properList[index].LockText.text = "(神塔" .. _infos[index].floor .. "层解锁)"
|
||||
this.properList[index].leftTxt.color = Color.New(0.72, 0.72, 0.72, 1)
|
||||
this.properList[index].rightTxt.color = Color.New(0.72, 0.72, 0.72, 1)
|
||||
end
|
||||
index = index + 1
|
||||
end
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(this.secondScroll.transform)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -145,6 +145,10 @@ function this.UpdateWin(_data)
|
|||
propInfoList[index].val = value
|
||||
index = index + 1
|
||||
end
|
||||
local addRate = 0
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
addRate = BecomeAGodManager.GetBecomeAGodProAddRate(3) / 100
|
||||
end
|
||||
for i = 1, this.propGrid.transform.childCount do
|
||||
local propText = this.propGrid.transform:GetChild(i - 1).gameObject
|
||||
if i > #propInfoList then
|
||||
|
|
@ -152,7 +156,15 @@ function this.UpdateWin(_data)
|
|||
else
|
||||
propText:SetActive(true)
|
||||
propText:GetComponent("Text").text = GetLanguageStrById(propInfoList[i].name)
|
||||
Util.GetGameObject(propText, "val"):GetComponent("Text").text = propInfoList[i].val
|
||||
if BecomeAGodManager.playerGodLevel > 0 and i > 2 then
|
||||
Util.GetGameObject(propText, "val"):GetComponent("Text").text = propInfoList[i].val ..
|
||||
" <color=#53FF00>神觉 +" .. (propInfoList[i].val * addRate / 100) .. " (" .. addRate .. "%)</color>"
|
||||
elseif i > 2 then
|
||||
Util.GetGameObject(propText, "val"):GetComponent("Text").text = propInfoList[i].val ..
|
||||
" <color=#53FF00>神觉 +0 (0%)</color>"
|
||||
else
|
||||
Util.GetGameObject(propText, "val"):GetComponent("Text").text = propInfoList[i].val
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -162,7 +174,8 @@ function this.UpdateWin(_data)
|
|||
if i > #skillInfo then
|
||||
skillObj:SetActive(false)
|
||||
else
|
||||
Util.GetGameObject(skillObj, "titleBg/title"):GetComponent("Text").text = GetLanguageStrById(skillInfo[i].title)
|
||||
Util.GetGameObject(skillObj, "titleBg/title"):GetComponent("Text").text = GetLanguageStrById(skillInfo[i]
|
||||
.title)
|
||||
Util.GetGameObject(skillObj, "titleBg/icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(
|
||||
skillInfo[i].icon)
|
||||
Util.GetGameObject(skillObj, "des"):GetComponent("Text").text = GetLanguageStrById(skillInfo[i].des)
|
||||
|
|
|
|||
|
|
@ -85,6 +85,35 @@ function this.GetCardPropDesStr(id)
|
|||
return proDesList
|
||||
end
|
||||
|
||||
function this.GetproDesLstWithChengshen(dataList, _color)
|
||||
local lis1 = {}
|
||||
local addRate = 0
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
addRate = BecomeAGodManager.GetBecomeAGodProAddRate(1) / 100
|
||||
end
|
||||
for k, v in pairs(dataList) do
|
||||
local _str = " <color=#07CB1D>神觉 +0 (0%)</color>"
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
_str = " <color=#07CB1D>神觉 +" ..
|
||||
GetPropertyFormatStrOne(PropertyConfig[k].Style, (v * addRate / 100)) .. " (" .. addRate .. "%)</color>"
|
||||
end
|
||||
table.insert(lis1,
|
||||
{
|
||||
str = string.format("<color=#%s>%s +%s</color>", _color, GetLanguageStrById(PropertyConfig[k].Info),
|
||||
GetPropertyFormatStrOne(PropertyConfig[k].Style, v)) .. _str,
|
||||
sort = PropertyConfig[k].SortId
|
||||
})
|
||||
end
|
||||
table.sort(lis1, function(a, b)
|
||||
return a.sort < b.sort
|
||||
end)
|
||||
local list = {}
|
||||
for i = 1, #lis1 do
|
||||
table.insert(list, lis1[i].str)
|
||||
end
|
||||
return list
|
||||
end
|
||||
|
||||
function this.GetproDesLst(dataList, _color)
|
||||
local lis1 = {}
|
||||
for k, v in pairs(dataList) do
|
||||
|
|
@ -228,6 +257,34 @@ function this.GetIncarnationPower()
|
|||
return proList
|
||||
end
|
||||
|
||||
---获取身外化身所有属性加成去掉成神加成
|
||||
function this.GetIncarnationTotalWithOutChengshenPro()
|
||||
local proList = {}
|
||||
for k, v in pairs(this.itemDataList) do
|
||||
if v.state > 0 then
|
||||
for k, v in pairs(v.proDatas) do
|
||||
if not proList[k] then
|
||||
proList[k] = 0
|
||||
end
|
||||
proList[k] = proList[k] + v
|
||||
--LogError("单个化身技------------------------- k=="..k.." v===="..v)
|
||||
end
|
||||
end
|
||||
end
|
||||
--主角等级表加的属性
|
||||
local playerConfig = ConfigManager.TryGetConfigData(ConfigName.PlayerLevelConfig, PlayerManager.level)
|
||||
if playerConfig and playerConfig.PlayerPropList then
|
||||
for key, v in pairs(playerConfig.PlayerPropList) do
|
||||
if proList[v[1]] then
|
||||
proList[v[1]] = proList[v[1]] + v[2]
|
||||
else
|
||||
proList[v[1]] = v[2]
|
||||
end
|
||||
end
|
||||
end
|
||||
return proList
|
||||
end
|
||||
|
||||
---获取身外化身所有属性加成
|
||||
function this.GetIncarnationTotalPro()
|
||||
local proList = {}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ function IncarnationPanel:BindEvent()
|
|||
local data = {}
|
||||
local singData = {}
|
||||
singData.title = Language[11620]
|
||||
singData.pro = IncarnationManager.GetproDesLst(IncarnationManager.GetIncarnationTotalPro(), "9c794f")
|
||||
singData.pro = IncarnationManager.GetproDesLstWithChengshen(IncarnationManager.GetIncarnationTotalWithOutChengshenPro(), "9c794f")
|
||||
singData.tip = "" --Language[11621]
|
||||
table.insert(data, singData)
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup, GENERAL_POPUP_TYPE.IncarnationDes, data)
|
||||
|
|
|
|||
|
|
@ -135,6 +135,10 @@ function this.ShowPokemonInfo()
|
|||
singleProData.proValue = value
|
||||
curAllPro[key] = singleProData
|
||||
end
|
||||
local addRate = 0
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
addRate = BecomeAGodManager.GetBecomeAGodProAddRate(1) / 100
|
||||
end
|
||||
local index = 1
|
||||
for key, value in pairs(curAllPro) do
|
||||
if proList[index] then
|
||||
|
|
@ -147,7 +151,21 @@ function this.ShowPokemonInfo()
|
|||
GetResourcePath(propertyConfig[key].PropertyIcon))
|
||||
end
|
||||
Util.GetGameObject(proList[index], "proName"):GetComponent("Text").text = curAllPro[key].proName
|
||||
Util.GetGameObject(proList[index], "proValue"):GetComponent("Text").text = curAllPro[key].proValue
|
||||
--Util.GetGameObject(proList[index], "proValue"):GetComponent("Text").text = curAllPro[key].proValue
|
||||
|
||||
if BecomeAGodManager.playerGodLevel > 0 and index > 1 then
|
||||
Util.GetGameObject(proList[index], "proValue"):GetComponent("Text").text = this.ToNumber(curAllPro[key]
|
||||
.proValue) ..
|
||||
" <color=#53FF00>神觉 +" ..
|
||||
this.ToNumber(curAllPro[key].proValue * addRate / 100) .. " (" .. addRate .. "%)</color>"
|
||||
elseif index > 1 then
|
||||
Util.GetGameObject(proList[index], "proValue"):GetComponent("Text").text = this.ToNumber(curAllPro[key]
|
||||
.proValue) ..
|
||||
" <color=#53FF00>神觉 +0 (0%)</color>"
|
||||
else
|
||||
Util.GetGameObject(proList[index], "proValue"):GetComponent("Text").text = curAllPro[key]
|
||||
.proValue
|
||||
end
|
||||
end
|
||||
index = index + 1
|
||||
end
|
||||
|
|
@ -212,6 +230,17 @@ function this.ShowPokemonInfo()
|
|||
end
|
||||
end
|
||||
|
||||
function this.ToNumber(value)
|
||||
local str = value
|
||||
local v = tonumber(value)
|
||||
if v > 100000000 then
|
||||
str = math.floor(value / 1000000) / 100 .. "亿"
|
||||
elseif v > 10000 then
|
||||
str = math.floor(value / 100) / 100 .. "万"
|
||||
end
|
||||
return str
|
||||
end
|
||||
|
||||
--长按升级结束后请求协议
|
||||
function this.LongLvUpClick(oldLv)
|
||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
|
|
|
|||
|
|
@ -118,6 +118,10 @@ function RewardTailsmanChipShowPopup:OnShow()
|
|||
for _, pro in ipairs(_BaseProList) do
|
||||
pro:SetActive(false)
|
||||
end
|
||||
local addRate = 0
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
addRate = BecomeAGodManager.GetBecomeAGodProAddRate(2) / 100
|
||||
end
|
||||
for index, prop in ipairs(proDatas) do
|
||||
local proConfigData = propertyConfig[index]
|
||||
if proConfigData then
|
||||
|
|
@ -132,6 +136,14 @@ function RewardTailsmanChipShowPopup:OnShow()
|
|||
else
|
||||
vText.text = GetPropertyFormatStr(proConfigData.Style, prop)
|
||||
end
|
||||
if BecomeAGodManager.playerGodLevel > 0 then
|
||||
vText.text = GetPropertyFormatStr(proConfigData.Style, prop) ..
|
||||
" <color=#07CB1D>神觉 +" ..
|
||||
(prop * addRate / 100) .. " (" .. addRate .. "%)</color>"
|
||||
else
|
||||
vText.text = GetPropertyFormatStr(proConfigData.Style, prop) ..
|
||||
" <color=#07CB1D>神觉 +0 (0%)</color>"
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ function this.GetSoulLockTip()
|
|||
end
|
||||
elseif v.OpenRules[1] == 3 then
|
||||
if BecomeAGodManager.playerGodLevel < v.OpenRules[2] then
|
||||
return "主角成神达到神王解锁"
|
||||
return "主角神觉达到神王解锁"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue