Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-06-09 11:49:16 +08:00
commit 40768a423d
13 changed files with 118 additions and 12 deletions

View File

@ -6725,7 +6725,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 16, y: -0.000015258789}
m_AnchoredPosition: {x: 16, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2781897261202178156
@ -7141,6 +7141,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u7FA4\u82F1\u5F81\u52DF4\u6B21"
LanguageIndex: 0
--- !u!1 &1389137624646221510
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8448650800933589464}
- component: {fileID: 6246754660137236122}
- component: {fileID: 5499004602435994190}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8448650800933589464
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1389137624646221510}
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: []
m_Father: {fileID: 2689109811163513307}
m_RootOrder: 3
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: 0.024986, y: -10.74}
m_SizeDelta: {x: 1082, y: 156.88}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6246754660137236122
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1389137624646221510}
m_CullTransparentMesh: 0
--- !u!114 &5499004602435994190
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1389137624646221510}
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: 0
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: 3c3ca5860d5c52347bc1041be73c312c, 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!1 &1417096120411139096
GameObject:
m_ObjectHideFlags: 0
@ -38006,6 +38080,7 @@ RectTransform:
- {fileID: 2598831097976425248}
- {fileID: 2688741801705900761}
- {fileID: 2689570574004261213}
- {fileID: 8448650800933589464}
m_Father: {fileID: 2689486735632733049}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -1035,6 +1035,7 @@ JumpType = {
XiangYaoDuoBao = 10020,--降妖夺宝
HeadChange = 10021, --巅峰赛
XianShiDuiHuan = 10022, --主题活动限时兑换
EndlessXingDongliBuy = 10023, --无尽行动力购买
ZhuTiHuoDong = 20000, --主题活动任务
QianKunShangDian = 20044, --乾坤商店
SheJiDaDianShangDian = 20060, --社稷大典商店

View File

@ -236,7 +236,7 @@ function this.Compound()
end
NetManager.ComplexEquipRequest(curIndex,curSelectEquip.Star,compoundNum,function(msg)
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
SoundManager.PlaySound(SoundConfig.UI_Baoqi)
-- SoundManager.PlaySound(SoundConfig.UI_Baoqi)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
this.OnClickTabBtn(curIndex)
end)

View File

@ -203,7 +203,7 @@ function this.Compound()
--LogError("materialState[i].equipSignConFig.Id "..i.." "..materialState[i].equipSignConFig.Id)
end
NetManager.ComplexSoulPrintRequest(curSelectSoulPrint.Id,matialSoulPrintids,function(msg)
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
-- SoundManager.PlaySound(SoundConfig.UI_Duanzao)
SoundManager.PlaySound(SoundConfig.UI_Baoqi)
--删除魂印
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()

View File

@ -220,7 +220,7 @@ function this.Compound()
return
end
NetManager.ComplexTreasureRequest(curSelectEquip.equipType,curIndex,curSelectEquip.quantity,compoundNum,function(msg)
SoundManager.PlaySound(SoundConfig.UI_Duanzao)
-- SoundManager.PlaySound(SoundConfig.UI_Duanzao)
SoundManager.PlaySound(SoundConfig.UI_Baoqi)
for i = 1, #msg.equipIds do
EquipTreasureManager.RemoveTreasureByIdDyn(msg.equipIds[i])

View File

@ -202,7 +202,6 @@ function GuildInfoPopup:BindEvent()
this:ClosePanel()
GuildManager.RefreshGuildAllRedState()
MyGuildManager.PackageNum=0
CheckRedPointStatus(RedPointType.Guid_GetPackage)
UIManager.OpenPanel(UIName.MainPanel)
end)
end)

View File

@ -197,6 +197,8 @@ function this.RefreshGuildAllRedState()
CheckRedPointStatus(RedPointType.Guild_Fete)
CheckRedPointStatus(RedPointType.Guild_House)
CheckRedPointStatus(RedPointType.Guild_House_Apply)
CheckRedPointStatus(RedPointType.Guid_GetPackage)
CheckRedPointStatus(RedPointType.Guid_SendPackage)
CheckRedPointStatus(RedPointType.Guild_RedPacket)
CheckRedPointStatus(RedPointType.Guild_Shop)
CheckRedPointStatus(RedPointType.Guild_Skill)
@ -205,5 +207,6 @@ function this.RefreshGuildAllRedState()
CheckRedPointStatus(RedPointType.Guild_AidGuild)
CheckRedPointStatus(RedPointType.Gui)
CheckRedPointStatus(RedPointType.Guild_Shop)
end
return GuildManager

View File

@ -32,9 +32,9 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil,sortingOrder,NPCPosType.maincity)
if PlayerManager.GetPlayerRide() > 0 then
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,239.9,0)
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,230,0)
else
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,176.1,0)
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,170,0)
end
--如果修行开启设置修行标识
if ActTimeCtrlManager.SingleFuncState(108) then
@ -54,14 +54,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder)
designation = _NpvData.userTitle
}
if _NpvData.userMount > 0 then
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,239.9,0)
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,230,0)
else
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,176.1,0)
Util.GetGameObject(instance.leader, "name").transform.localPosition = Vector3.New(0,170,0)
end
instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,2, PlayerLiveViewData,sortingOrder,NPCPosType.maincity)
end
-- instance.NpcGO = PlayerLiveView:New(instance.roleRootTran,1, nil)
--instance.NpcGO:SetNameHeight(3)
--instance.NpcGO:SetNameHeight(10)
instance.NpcGO:OnOpen()
instance.NameText.text = PlayerManager.nickName
instance.rect = rect

View File

@ -680,6 +680,7 @@ function this.InitMissionData()
data.info = ""
data.progress = 0
data.value = v.Values[2][1]
data.jump = v.Jump
data.BoxReward = {}
for i = 1,#v.Reward do
table.insert(data.BoxReward ,v.Reward[i])
@ -898,6 +899,7 @@ function this.GetAllRewardData()
end
local id,lv = caluteLv(willItemCount) or 0,0
for k,v in ipairs(this.treasureDataReward) do
--4 未达成 3 可再次领取 2 可领取 1 已领取 -1 完美领取(充钱领取过的)
if v.Reward then
for n,m in ipairs(v.Reward) do
if m.type == 2 then
@ -905,6 +907,12 @@ function this.GetAllRewardData()
table.insert(rewardData,m)
else
table.insert(rewardData1,m)
end
else
if (v.state == 4 and id >= v.Id) or v.state == 2 then
if id >= v.Id then
table.insert(rewardData,m)
end
end
end
end

View File

@ -661,6 +661,9 @@ local jumpDic = {
[JumpType.FightLevel] = function (data)
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
end,
[JumpType.EndlessXingDongliBuy] = function(data)
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 })
end,
}
function this.JumpActivity(data,skipfactor)

View File

@ -144,6 +144,9 @@ function this.SetScrollPre(root,data)
Util.AddOnceClick(goBtn,function()
this:ClosePanel()
if data.jump and data.jump > 0 then
JumpManager.GoJump(data.jump)
end
end)
Util.AddOnceClick(getBtn,function()
if getFunc then

View File

@ -197,6 +197,20 @@ function this:showRewardQinglong()
indirect[id] = indirect[id] + num
end
end
else
if reward.state == 0 then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
elseif reward.state == -2 then
if level >= reward.level then
if not direct[id] then
direct[id] = 0
end
direct[id] = direct[id] + num
end
end
end
end
end

View File

@ -120,8 +120,8 @@ function SecretBoxBuyOnePanel:OnOpen(...)
if this.recruitType <= RecruitType.LightDarkSingle then --光暗什么...的抽卡
this.itemIcon1.sprite=this.spLoader:LoadSprite("r_RareItem_Specail_0002")
this.detailText.text = "赠送1个元神玉,20置换玉"
this.detailText1.text = "赠送1个元神玉,20置换玉"
this.detailText.text = "赠送1个元神玉和20个置换玉"
this.detailText1.text = "赠送1个元神玉和20个置换玉"
elseif this.recruitType == drawtType.FindFairySingle then --东海寻仙
this.FindFairyCountDown(FindFairyManager.GetActivityTime())
FindFairyManager.SetFreeExtract(1)