Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b

dev_chengFeng
ZhangBiao 2021-04-09 20:31:55 +08:00
commit 671ba829ca
5 changed files with 4685 additions and 3800 deletions

View File

@ -516,7 +516,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: 162, y: 131}
m_AnchoredPosition: {x: 131, y: 131}
m_SizeDelta: {x: 742, y: 373}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1115762242
@ -2471,7 +2471,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: 162, y: 131}
m_AnchoredPosition: {x: 131, y: 131}
m_SizeDelta: {x: 742, y: 373}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &553515594953004562
@ -5580,7 +5580,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &948311900591901430
RectTransform:
m_ObjectHideFlags: 0
@ -7794,7 +7794,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: 162, y: 131}
m_AnchoredPosition: {x: 134, y: 131}
m_SizeDelta: {x: 742, y: 373}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2697147632530549717
@ -14696,7 +14696,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: 162, y: 131}
m_AnchoredPosition: {x: 134, y: 131}
m_SizeDelta: {x: 742, y: 373}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3787549287144016653
@ -16569,7 +16569,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: 162, y: 131}
m_AnchoredPosition: {x: 134, y: 131}
m_SizeDelta: {x: 742, y: 373}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8102711455246492606

View File

@ -111,9 +111,9 @@ RectTransform:
m_Father: {fileID: 2280241434527131215}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 91, y: -71.5}
m_SizeDelta: {x: 64.04, y: 57.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1926325275717871179
@ -497,7 +497,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4440508965864991817}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -545,9 +545,9 @@ RectTransform:
m_Father: {fileID: 2280241434527131215}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 22.4, y: -28.6}
m_SizeDelta: {x: 72.79, y: 57.1}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8005151546230895454
@ -582,13 +582,13 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 1
m_BestFit: 0
m_MinSize: 24
m_MaxSize: 32
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5956\u52B1:"
@ -624,9 +624,9 @@ RectTransform:
m_Father: {fileID: 2280241434527131215}
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: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 72.66498, y: -71.4999}
m_SizeDelta: {x: 55.53, y: 48.41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5262296256222781431

View File

@ -4,6 +4,7 @@ local skillGos = {}
local curSuitProGo = {}
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local equipSuiteConfig = ConfigManager.GetConfig(ConfigName.EquipSuiteConfig)
local mainProGoList = {}
--初始化组件(用于子类重写)
function HandBookEquipInfoPanel:InitComponent()
@ -18,9 +19,12 @@ function HandBookEquipInfoPanel:InitComponent()
self.equipQuaText=Util.GetGameObject(self.transform, "Content/bg/equipInfo/GameObject/qualityText"):GetComponent("Text")
self.equipInfoText=Util.GetGameObject(self.transform, "Content/bg/equipInfo/GameObject/equipInfoText"):GetComponent("Text")
--装备属性
self.mainPro=Util.GetGameObject(self.transform, "Content/bg/mainPro")
self.mainProName=Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/curProName"):GetComponent("Text")
self.mainProVale=Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/curProVale"):GetComponent("Text")
-- self.mainPro=Util.GetGameObject(self.transform, "Content/bg/mainPro")
-- self.mainProName=Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/curProName"):GetComponent("Text")
-- self.mainProVale=Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/curProVale"):GetComponent("Text")
for i = 1, 4 do
mainProGoList[i] = Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject ("..i..")")
end
self.equipOtherProPre=Util.GetGameObject(self.transform, "Content/bg/proPre")
self.equipProGrid = Util.GetGameObject(self.transform, "Content/bg/proRect/GameObject/proGrid")
@ -32,7 +36,7 @@ function HandBookEquipInfoPanel:InitComponent()
skillGos[i] = Util.GetGameObject(self.transform, "Content/bg/skillGrid/skillGrid1 ("..i..")")
end
self.text1 = Util.GetGameObject(self.transform, "Content/bg/mainPro/GameObject/Text"):GetComponent("Text")
self.text1 = Util.GetGameObject(self.transform, "Content/bg/GameObject/Text"):GetComponent("Text")
self.text2 = Util.GetGameObject(self.transform, "Content/bg/proRect/GameObject/Text"):GetComponent("Text")
self.text3 = Util.GetGameObject(self.transform, "Content/bg/skillObject/GameObject/Text"):GetComponent("Text")
@ -77,9 +81,19 @@ function HandBookEquipInfoPanel:OnOpen(equipSId)
self.equipPos.text=string.format(Language[11090],GetJobStrByJobNum(equipConfigData.ProfessionLimit))
EquipManager.SetEquipStarShow(Util.GetGameObject(self.transform, "Content/bg/equipInfo/GameObject/star"),itemConfigData.Id)
--装备属性
self.mainProName.text=GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, equipConfigData.PropertyMin[1]).Info)
self.mainProVale.text=equipConfigData.Property[1][2]--"【"..equipConfigData.PropertyMin[2].."-"..equipConfigData.PropertyMax[2].."】"
-- self.mainProName.text=GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig, equipConfigData.PropertyMin[1]).Info)
-- self.mainProVale.text=equipConfigData.Property[1][2]--"【"..equipConfigData.PropertyMin[2].."-"..equipConfigData.PropertyMax[2].."】"
for i = 1, #mainProGoList do
mainProGoList[i]:SetActive(false)
if equipConfigData.Property[i] then
mainProGoList[i]:SetActive(true)
local PropertyConfig = ConfigManager.GetConfigData(ConfigName.PropertyConfig, equipConfigData.Property[i][1])
Util.GetGameObject(mainProGoList[i], "equipInfo/curProName"):GetComponent("Text").text=GetLanguageStrById(PropertyConfig.Info)
Util.GetGameObject(mainProGoList[i], "equipInfo/curProVale"):GetComponent("Text").text= GetEquipPropertyFormatStr(PropertyConfig.Style,equipConfigData.Property[i][2])
end
end
--套装属性
if equipSuiteConfig[equipConfigData.Star] then--SuiteID
Util.GetGameObject(self.transform, "Content/bg/proRect"):SetActive(true)

View File

@ -1992,3 +1992,7 @@
11992,限购1次
11993,激活
11994,奖励:
11995,子节点
11996,检测
11997,神器大转盘!最后选中的格子为最终奖励。
11998,<color=#95523B>解锁秘宝可以领取额外专属奖励并直接获得200积分<color=#CC4325>可获取1980妖晶邮件领取</color></color>

Can't render this file because it contains an unexpected character in line 1374 and column 8.