Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
7c786a4573
|
|
@ -86352,16 +86352,16 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4994094203524441541}
|
||||
- component: {fileID: 5789233355107392950}
|
||||
m_Layer: 0
|
||||
m_Name: c_dhdj_00042_001_02
|
||||
m_Name: Effect_c_dhdj_00042_attack
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4994094203524441541
|
||||
Transform:
|
||||
--- !u!224 &5789233355107392950
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
|
|
@ -86375,6 +86375,11 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
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, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3749855958173387464
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -216230,7 +216235,7 @@ Transform:
|
|||
- {fileID: 2727293560008165737}
|
||||
- {fileID: 7494642602904554780}
|
||||
- {fileID: 7781876518439619559}
|
||||
m_Father: {fileID: 4994094203524441541}
|
||||
m_Father: {fileID: 5789233355107392950}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &9008653744260767010
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -22368,7 +22368,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: 46.8, y: -57}
|
||||
m_AnchoredPosition: {x: -69, y: -69}
|
||||
m_SizeDelta: {x: 239.96, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4536685851633023705
|
||||
|
|
|
|||
|
|
@ -43764,7 +43764,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4EF7\u503C\uFF1A1140\u5143"
|
||||
m_Text: "\u4EF7\u503C\uFF1A$1140"
|
||||
LanguageIndex: 11732
|
||||
--- !u!1 &5974049692653517533
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -2909,6 +2909,14 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 0
|
||||
resAbNameIndex: 0
|
||||
- resName: l_yueka_haohuayueka
|
||||
extension: .png
|
||||
resPathIndex: 0
|
||||
resAbNameIndex: 0
|
||||
- resName: l_yueka_putongyueka
|
||||
extension: .png
|
||||
resPathIndex: 0
|
||||
resAbNameIndex: 0
|
||||
- resName: q_qinlongmibao_anniu
|
||||
extension: .png
|
||||
resPathIndex: 0
|
||||
|
|
@ -3277,6 +3285,14 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 1
|
||||
resAbNameIndex: 0
|
||||
- resName: r_mrcz_zi_33
|
||||
extension: .png
|
||||
resPathIndex: 1
|
||||
resAbNameIndex: 0
|
||||
- resName: r_mrcz_zi_4
|
||||
extension: .png
|
||||
resPathIndex: 1
|
||||
resAbNameIndex: 0
|
||||
- resName: r_qrkh_lq
|
||||
extension: .png
|
||||
resPathIndex: 1
|
||||
|
|
@ -5205,10 +5221,18 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 32
|
||||
resAbNameIndex: 15
|
||||
- resName: s_shouchong_$1
|
||||
extension: .png
|
||||
resPathIndex: 32
|
||||
resAbNameIndex: 15
|
||||
- resName: s_shouchong_100
|
||||
extension: .png
|
||||
resPathIndex: 32
|
||||
resAbNameIndex: 15
|
||||
- resName: s_shouchong_15
|
||||
extension: .png
|
||||
resPathIndex: 32
|
||||
resAbNameIndex: 15
|
||||
- resName: s_shouchong_6
|
||||
extension: .png
|
||||
resPathIndex: 32
|
||||
|
|
@ -15465,6 +15489,10 @@ MonoBehaviour:
|
|||
extension: .jpg
|
||||
resPathIndex: 95
|
||||
resAbNameIndex: 793
|
||||
- resName: l_yueka_beijin2
|
||||
extension: .jpg
|
||||
resPathIndex: 95
|
||||
resAbNameIndex: 793
|
||||
- resName: l_yueka_beijindi
|
||||
extension: .jpg
|
||||
resPathIndex: 95
|
||||
|
|
@ -34421,6 +34449,10 @@ MonoBehaviour:
|
|||
extension: .mat
|
||||
resPathIndex: 251
|
||||
resAbNameIndex: 1995
|
||||
- resName: dajin_effect_15_lz 2
|
||||
extension: .mat
|
||||
resPathIndex: 251
|
||||
resAbNameIndex: 1995
|
||||
- resName: dajin_effect_16
|
||||
extension: .mat
|
||||
resPathIndex: 251
|
||||
|
|
@ -49580,7 +49612,6 @@ MonoBehaviour:
|
|||
- lz4/atlas/publicatlas.unity3d
|
||||
- lz4/atlas/tagatlas.unity3d
|
||||
- lz4/atlas/tagbuttonatlas.unity3d
|
||||
- lz4/bg/artfontbg/l_yueka_beijindi.unity3d
|
||||
- lz4/bg/artfontbg/r_lianxuchongzhi_beijing.unity3d
|
||||
- lz4/bg/artfontbg/r_meiriqiandaobeijing.unity3d
|
||||
- lz4/bg/l_libao_beijin.unity3d
|
||||
|
|
@ -50147,6 +50178,7 @@ MonoBehaviour:
|
|||
- lz4/publicartres/models.unity3d
|
||||
- assetBundleName: lz4/publicartres/materials.unity3d
|
||||
dependences:
|
||||
- lz4/atlas/firstrechargeatlas.unity3d
|
||||
- lz4/bg/cardmask.unity3d
|
||||
- lz4/bg/cardmask2.unity3d
|
||||
- lz4/publicartres/shaders.unity3d
|
||||
|
|
|
|||
|
|
@ -2343,7 +2343,7 @@
|
|||
[12342] = "剩余购买次数:",
|
||||
[12343] = "<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> ",
|
||||
[12344] = "<color=#FFDAB6>全公会成员攻击力+ %s ",
|
||||
[12345] = "(%s:%s:%s:后失效)",
|
||||
[12345] = "(%s后失效)",
|
||||
[12346] = "已击败【%s】!",
|
||||
[12347] = "即可再抽取",
|
||||
[12348] = "青龙秘宝",
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ function this.SetScroll(i)
|
|||
this.scrollView:SetData(curData,function(index,root)
|
||||
this.SetData(root,curData[index], curData[index - 1])
|
||||
end)
|
||||
this.scrollView:SetIndex(curMaxOpenId)
|
||||
this.scrollView:SetIndex(1)
|
||||
end
|
||||
|
||||
--设置滚动条数据 root根节点 data本地表数据 ldata 上一条数据
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ local cutOpenIndexMonsterConFig
|
|||
local itemList = {}--优化itemView使用
|
||||
local sorting = 0
|
||||
local curBuyIndex = 0
|
||||
local oldSelceParent
|
||||
this.playerScrollHead={}--滚动条头像
|
||||
--初始化组件(用于子类重写)
|
||||
function GuildTranscriptMainPopup:InitComponent()
|
||||
|
|
@ -161,15 +162,10 @@ function GuildTranscriptMainPopup:BindEvent()
|
|||
local second = msg.nextTime - PlayerManager.serverTime
|
||||
if second <= 0 then
|
||||
ChatManager.RequestSendGuildTranscript(function()
|
||||
-- PopupTipPanel.ShowTip("")
|
||||
end)
|
||||
PopupTipPanel.ShowTip("已发送集结公告!")
|
||||
else
|
||||
local day = math.floor(second / (24 * 3600))
|
||||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor(second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
local timeStr = string.format(Language[12231], minute, sec)
|
||||
PopupTipPanel.ShowTip(string.format(Language[12335],timeStr))
|
||||
PopupTipPanel.ShowTip(string.format(Language[12335],TimeToMS(second)))
|
||||
end
|
||||
end)
|
||||
end)
|
||||
|
|
@ -265,11 +261,11 @@ function this.SingleChapterDataShow(go,data)
|
|||
local monsterData = this.GetMonsterConfigDataById(data.MonsterId)
|
||||
if not monsterData then return end
|
||||
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig[monsterData.MonsterId].Icon))
|
||||
if cutOpenIndex > data.Id then--已打过
|
||||
if GuildTranscriptManager.GetCurBoss() > data.Id then--已打过
|
||||
Util.SetGray(go, true)
|
||||
lock:SetActive(false)
|
||||
mask:SetActive(false)
|
||||
elseif cutOpenIndex == data.Id then--已开启
|
||||
elseif GuildTranscriptManager.GetCurBoss() == data.Id then--已开启
|
||||
Util.SetGray(go, false)
|
||||
lock:SetActive(false)
|
||||
mask:SetActive(false)
|
||||
|
|
@ -278,8 +274,10 @@ function this.SingleChapterDataShow(go,data)
|
|||
lock:SetActive(true)
|
||||
mask:SetActive(true)
|
||||
end
|
||||
if cutOpenIndex == data.Id then
|
||||
if cutOpenIndex == data.Id then
|
||||
this.SetSelectImagePos(go)
|
||||
elseif oldSelceParent == go then
|
||||
this.SelectImage:SetActive(false)
|
||||
end
|
||||
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
||||
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
||||
|
|
@ -360,6 +358,7 @@ function this.ShowBossInfo()
|
|||
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
|
||||
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
|
||||
this.bossHerohpPassText.text = Language[12340]
|
||||
this.bossHerohpPass.fillAmount = 0
|
||||
end
|
||||
local liveName = GetResourcePath(curheroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
|
||||
|
|
@ -499,14 +498,11 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
|||
end
|
||||
end
|
||||
function this.TimeStampToDateString(second)
|
||||
local day = math.floor(second / (24 * 3600))
|
||||
local minute = math.floor(second / 60) % 60
|
||||
local sec = math.floor( second % 60)
|
||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||
return string.format(Language[12345],hour, minute, sec)
|
||||
return string.format(Language[12345],TimeToHMS(second))
|
||||
end
|
||||
|
||||
function this.SetSelectImagePos(parent)
|
||||
oldSelceParent = parent
|
||||
Util.SetGray(this.SelectImage,false)
|
||||
this.SelectImage:SetActive(true)
|
||||
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ function this.SetBasicValues(giftGoodsList)
|
|||
|
||||
local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId)
|
||||
|
||||
LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||
..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||
..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
||||
-- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:"
|
||||
-- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:"
|
||||
-- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes)
|
||||
|
||||
|
||||
if giftGoodsInfoList[rechargeConfig.Type] then
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ function this:AllEquipUpBtnOnClick()
|
|||
LogBlue("装备id:"..curHeroEquipDatas[index].id.." indexMaxPower:"..indexMaxPower)
|
||||
end
|
||||
end
|
||||
LogGreen("循环计算每个装备的战力")
|
||||
LogGreen("循环计算每个装备的战力")
|
||||
for i = 1, #curPosEquip do
|
||||
local addPower = 0
|
||||
local curEquip = curPosEquip[i]
|
||||
|
|
@ -936,13 +936,6 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
|
|||
elseif _type == 4 then
|
||||
--一键穿 把身上装备解绑英雄id
|
||||
if _equipOrTreasure == 1 then
|
||||
-- for i=1,#_selectEquipDataList do
|
||||
-- local temp = EquipManager.GetSingleHeroSingleEquipData(_selectEquipDataList[i],curHeroData.dynamicId)
|
||||
-- if not temp then
|
||||
-- LogBlue(_selectEquipDataList[i].." "..curHeroData.dynamicId)
|
||||
-- end
|
||||
-- end
|
||||
--宝物
|
||||
for n, m in ipairs(_selectEquipDataList) do
|
||||
local isadd = true
|
||||
for i = 1, #curHeroData.equipIdList do
|
||||
|
|
@ -960,16 +953,24 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
|
|||
end
|
||||
EquipManager.UpdateEquipData(_selectEquipDataList, curHeroData.dynamicId)
|
||||
else
|
||||
for k, v in ipairs(curHeroData.jewels) do
|
||||
EquipTreasureManager.SetTreasureUpOrDown(v, "0")
|
||||
end
|
||||
curHeroData.jewels = {}
|
||||
for i = 1, #_selectEquipDataList do
|
||||
--把选择的装备绑上英雄
|
||||
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
||||
--穿
|
||||
--再把英雄装备list 清空并添加上新选择的装备
|
||||
table.insert(curHeroData.jewels, _selectEquipDataList[i])
|
||||
local isadd = true
|
||||
for i = 1, #curHeroData.jewels do
|
||||
--如果英雄身上有和选中的宝物的位置相同的,就替换
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(curHeroData.jewels[i]).equipType ==
|
||||
EquipTreasureManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then
|
||||
EquipTreasureManager.SetTreasureUpOrDown(curHeroData.jewels[i], "0")
|
||||
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
||||
table.remove(curHeroData.jewels,i)
|
||||
table.insert(curHeroData.jewels, _selectEquipDataList[i])
|
||||
isadd = false
|
||||
break
|
||||
end
|
||||
end
|
||||
if isadd then
|
||||
EquipTreasureManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
||||
table.insert(curHeroData.jewels, _selectEquipDataList[i])
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif _type == 5 then
|
||||
|
|
|
|||
|
|
@ -2342,7 +2342,7 @@
|
|||
12342,剩余购买次数:
|
||||
12343,<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color>
|
||||
12344,<color=#FFDAB6>全公会成员攻击力+ %s
|
||||
12345,(%s:%s:%s:コ<EFBFBD>ァミァ)
|
||||
12345,(%sコ<73>ァミァ)
|
||||
12346,已击败【%s】!
|
||||
12347,即可再抽取
|
||||
12348,青龙秘宝
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue