Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
commit
dc36b34dcc
|
@ -399,7 +399,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6356180131017497978
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -479,7 +479,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8316493507308908137
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -762,7 +762,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4475740642665424370}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
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:
|
||||
|
@ -953,7 +953,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2341039918114999532
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1089,7 +1089,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4420068252593448750
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1163,7 +1163,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1089195076823875445
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1243,7 +1243,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &5549198226521472623
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1323,7 +1323,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7016825676111757285
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1397,7 +1397,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &9126532628988149360
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1471,7 +1471,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7992895934370114010
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1545,7 +1545,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6500557232517335146
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1814,7 +1814,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2612712074139929702
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1965,7 +1965,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1000258875902609876
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2045,7 +2045,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &8368375225317432911
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2443,7 +2443,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7498108257538012307
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2523,7 +2523,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1962659654553934633
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2905,7 +2905,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2036183504607690646
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -2809,6 +2809,9 @@ end
|
|||
---检测功能开启方法
|
||||
function CheckFunctionOpen(_funId)
|
||||
local data = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,_funId)
|
||||
if data.IsOpen==0 then
|
||||
return false
|
||||
end
|
||||
-- 当前玩家等级
|
||||
local playerLv = PlayerManager.level
|
||||
--开启规则
|
||||
|
|
|
@ -89,7 +89,7 @@ function GongMingResultTips:OnOpen(flag)
|
|||
|
||||
local data = HarmonyManager:GetAdditions()
|
||||
Util.GetGameObject(this.TextOneAll,"textDegree"):GetComponent("Text").text = string.format("%d",herodata.oriLv)
|
||||
if data[2].value > 0 then
|
||||
if data[2] and data[2].value > 0 then
|
||||
-- body
|
||||
-- if _Star >= data[2].value then
|
||||
-- -- body
|
||||
|
|
|
@ -16,8 +16,14 @@ function GongMingResultTips:InitComponent()
|
|||
self.breakOpenSkillGrid =Util.GetGameObject(self.transform, "bg/breakOpenSkill/Mask")
|
||||
self.upStarSkillTextPreDegree = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre1/content")
|
||||
self.upStarSkillTextPreEquip = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre2/content")
|
||||
self.preEquip = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre2")
|
||||
self.preEquip:SetActive(false)
|
||||
self.upStarSkillTextPreHun = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre3/content")
|
||||
self.preHun = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre3")
|
||||
self.preHun:SetActive(false)
|
||||
self.upStarSkillTextPreSoul = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre4/content")
|
||||
self.preSoul = Util.GetGameObject(self.transform, "bg/upStarSkillTextPre4")
|
||||
self.preSoul:SetActive(false)
|
||||
self.upStarSkillTextPreFa = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre5/content")
|
||||
self.upStarSkillTextPreFa1 = Util.GetGameObject(self.transform,"bg/upStarSkillTextPre5")
|
||||
self.upStarSkillTextPreFa1:SetActive(false)
|
||||
|
|
|
@ -161,7 +161,8 @@ function RoleInfoLayout:BindEvent()
|
|||
end
|
||||
|
||||
if curHeroData.lv<this.GetCurHeroLvLimit() and oldUpMaxLv==curHeroData.lv then
|
||||
PopupTipPanel.ShowTip("材料不足")
|
||||
-- PopupTipPanel.ShowTip("材料不足")
|
||||
this:ShowCostNotEnoughTip()
|
||||
return
|
||||
end
|
||||
this:DeleteLvUpMaterials(oldUpMaxLv)
|
||||
|
@ -1011,13 +1012,13 @@ function RoleInfoLayout:ShowCostNotEnoughTip()
|
|||
PopupTipPanel.ShowTip(BagManager.GetItemNameById(costId).."不足无法升级")
|
||||
end
|
||||
|
||||
local item=BagManager.GetItemDataByTimeIsGold(costId)
|
||||
if item then
|
||||
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4,item)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId)
|
||||
end
|
||||
local _itemData = BagManager.bagDatas[itemSid]
|
||||
local item=BagManager.GetItemDataByTimeIsGold(costId)
|
||||
if item then
|
||||
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4,item)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,costId)
|
||||
end
|
||||
--local _itemData = BagManager.bagDatas[itemSid]
|
||||
|
||||
--if costId==4 then
|
||||
|
||||
|
|
Loading…
Reference in New Issue