Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6e0eccfde5
File diff suppressed because it is too large
Load Diff
|
@ -479,6 +479,7 @@ RectTransform:
|
||||||
- {fileID: 4210854367932731508}
|
- {fileID: 4210854367932731508}
|
||||||
- {fileID: 1965169765554186566}
|
- {fileID: 1965169765554186566}
|
||||||
- {fileID: 4558947000371413883}
|
- {fileID: 4558947000371413883}
|
||||||
|
- {fileID: 2033406775299504181}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
@ -11095,6 +11096,143 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 0
|
m_FillClockwise: 0
|
||||||
m_FillOrigin: 2
|
m_FillOrigin: 2
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &2689889527873723320
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2033406775299504181}
|
||||||
|
- component: {fileID: 5406922750988588122}
|
||||||
|
- component: {fileID: 1199748476850193939}
|
||||||
|
- component: {fileID: 1445601311729786276}
|
||||||
|
- component: {fileID: 4800005995910992411}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: helpBtn
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &2033406775299504181
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2689889527873723320}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 224104263369352388}
|
||||||
|
m_RootOrder: 11
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -100, y: -100}
|
||||||
|
m_SizeDelta: {x: 68, y: 68}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5406922750988588122
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2689889527873723320}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1199748476850193939
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2689889527873723320}
|
||||||
|
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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &1445601311729786276
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2689889527873723320}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 3
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1199748476850193939}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &4800005995910992411
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2689889527873723320}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &2708091584041882913
|
--- !u!1 &2708091584041882913
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1629,6 +1629,7 @@ HELP_TYPE = {
|
||||||
Practice = 91,--修行
|
Practice = 91,--修行
|
||||||
FightLevel = 92,--山河社稷图
|
FightLevel = 92,--山河社稷图
|
||||||
GuildInFo = 95,--工会信息
|
GuildInFo = 95,--工会信息
|
||||||
|
WishCard = 97,--心愿抽卡
|
||||||
}
|
}
|
||||||
|
|
||||||
NumToComplexFont = {
|
NumToComplexFont = {
|
||||||
|
|
|
@ -21,8 +21,10 @@ function this:InitComponent(gameObject)
|
||||||
self.maskList = {}
|
self.maskList = {}
|
||||||
--wishList
|
--wishList
|
||||||
self.wishListObj = {}
|
self.wishListObj = {}
|
||||||
|
self.bgObjlist = {}
|
||||||
for i = 1, 3 do
|
for i = 1, 3 do
|
||||||
self.wishListObj[i] = Util.GetGameObject(gameObject,"wishList/hero ("..i..")")
|
self.wishListObj[i] = Util.GetGameObject(gameObject,"wishList/hero ("..i..")")
|
||||||
|
self.bgObjlist[i] = Util.GetGameObject(gameObject,"Bg/bglist/obj"..i)
|
||||||
end
|
end
|
||||||
--tabList
|
--tabList
|
||||||
self.tabListObj = {}
|
self.tabListObj = {}
|
||||||
|
@ -42,6 +44,12 @@ function this:BindEvent()
|
||||||
this:Refresh(true,false)
|
this:Refresh(true,false)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
for i = 1, 3 do
|
||||||
|
Util.AddOnceClick(self.bgObjlist[i],function ()
|
||||||
|
self.curSelect = RecruitManager.CheckIndex()
|
||||||
|
this:Refresh(true,false)
|
||||||
|
end)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:AddListener()
|
function this:AddListener()
|
||||||
|
@ -78,12 +86,9 @@ function this:SetUpHero()
|
||||||
local starGrid = Util.GetGameObject(go, "star")
|
local starGrid = Util.GetGameObject(go, "star")
|
||||||
local choosed = Util.GetGameObject(go, "choosed")
|
local choosed = Util.GetGameObject(go, "choosed")
|
||||||
local heroId = RecruitManager.WishCardData[i].heroTid
|
local heroId = RecruitManager.WishCardData[i].heroTid
|
||||||
frame.gameObject:SetActive(true)
|
|
||||||
proIcon.gameObject:SetActive(true)
|
|
||||||
starGrid:SetActive(true)
|
|
||||||
choosed:SetActive(false)
|
choosed:SetActive(false)
|
||||||
icon.gameObject:SetActive(true)
|
|
||||||
if heroId > 0 then
|
if heroId > 0 then
|
||||||
|
go:SetActive(true)
|
||||||
local heroData = heroConfig[heroId]
|
local heroData = heroConfig[heroId]
|
||||||
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
|
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
|
||||||
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
|
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
|
||||||
|
@ -94,21 +99,13 @@ function this:SetUpHero()
|
||||||
if RecruitManager.WishCardData[i].status == 1 then
|
if RecruitManager.WishCardData[i].status == 1 then
|
||||||
PopupTipPanel.ShowTip("同系神将每日只可选择一位获取一次概率提升~")
|
PopupTipPanel.ShowTip("同系神将每日只可选择一位获取一次概率提升~")
|
||||||
elseif RecruitManager.WishCardData[i].status == 0 then
|
elseif RecruitManager.WishCardData[i].status == 0 then
|
||||||
LogYellow("heroId:"..tostring(heroId))
|
|
||||||
RecruitManager.ChangeHero(2,heroId,function ()
|
RecruitManager.ChangeHero(2,heroId,function ()
|
||||||
this:Refresh(false,false)
|
this:Refresh(false,false)
|
||||||
end)--英雄变更:1增加、2卸下
|
end)--英雄变更:1增加、2卸下
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
frame.gameObject:SetActive(false)
|
go:SetActive(false)
|
||||||
proIcon.gameObject:SetActive(false)
|
|
||||||
starGrid:SetActive(false)
|
|
||||||
icon.gameObject:SetActive(false)
|
|
||||||
Util.AddOnceClick(go,function ()
|
|
||||||
self.curSelect = RecruitManager.CheckIndex()
|
|
||||||
this:Refresh(false,false)
|
|
||||||
end)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -76,6 +76,8 @@ function RecruitPanel:InitComponent()
|
||||||
this.upper=Util.GetGameObject(this.gameObject,"Upper/Num"):GetComponent("Text")--召唤上限
|
this.upper=Util.GetGameObject(this.gameObject,"Upper/Num"):GetComponent("Text")--召唤上限
|
||||||
|
|
||||||
this.wishBtn = Util.GetGameObject(this.gameObject,"wishBtn")
|
this.wishBtn = Util.GetGameObject(this.gameObject,"wishBtn")
|
||||||
|
this.helpBtn = Util.GetGameObject(this.gameObject, "helpBtn")
|
||||||
|
this.helpPosition = this.helpBtn:GetComponent("RectTransform").localPosition
|
||||||
end
|
end
|
||||||
|
|
||||||
function RecruitPanel:BindEvent()
|
function RecruitPanel:BindEvent()
|
||||||
|
@ -83,6 +85,10 @@ function RecruitPanel:BindEvent()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
end)
|
end)
|
||||||
|
--帮助按钮
|
||||||
|
Util.AddClick(this.helpBtn, function()
|
||||||
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.WishCard,this.helpPosition.x,this.helpPosition.y)
|
||||||
|
end)
|
||||||
--宝箱按钮
|
--宝箱按钮
|
||||||
Util.AddClick(this.boxBtn,function()
|
Util.AddClick(this.boxBtn,function()
|
||||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox)
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox)
|
||||||
|
|
Loading…
Reference in New Issue