Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts: # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua # Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua # Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.luadev_chengFeng
commit
44a2538eb3
|
@ -4377,7 +4377,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: 248, y: 644}
|
||||
m_AnchoredPosition: {x: 0, y: 601}
|
||||
m_SizeDelta: {x: 584, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7091958631644234883
|
||||
|
@ -4408,7 +4408,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 26e7b9b885f7a9d4b8681d2e7ccbd265, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c79ca6ef5a3666c43b6b15a4d3b88f4e, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -4843,10 +4843,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
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_SizeDelta: {x: 0, y: 38}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -25}
|
||||
m_SizeDelta: {x: 140, y: 38}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &4351523970267476369
|
||||
CanvasRenderer:
|
||||
|
@ -18517,9 +18517,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
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: 140, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 140, y: -25}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &490872853371369416
|
||||
|
@ -27994,7 +27994,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -538.24, y: 82}
|
||||
m_SizeDelta: {x: 0, y: 50}
|
||||
m_SizeDelta: {x: 467, y: 50}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &4232190997202796534
|
||||
MonoBehaviour:
|
||||
|
@ -29392,10 +29392,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 186, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 38}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 186, y: -25}
|
||||
m_SizeDelta: {x: 281, y: 38}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &5421451615274732876
|
||||
CanvasRenderer:
|
||||
|
@ -31190,7 +31190,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6872382260446978439
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -35336,10 +35336,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4492904220401090137}
|
||||
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: 140, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 46}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 140, y: -25}
|
||||
m_SizeDelta: {x: 46, y: 46}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &49029013758658618
|
||||
CanvasRenderer:
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -132,7 +132,7 @@ function this.InitActivityServerData(msg, isUpdate)
|
|||
end
|
||||
for i, v in ipairs(msg.activityInfo) do
|
||||
this.mission[v.activityId] = v
|
||||
--LogGreen("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
LogGreen("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
for n, m in ipairs(v.mission) do
|
||||
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||
|
@ -228,7 +228,6 @@ function this.GetActivityTypeInfo(type)
|
|||
local missionData = nil
|
||||
table.walk(globalActConfigs, function(actConfigInfo)
|
||||
if this.mission[actConfigInfo.Id] then
|
||||
--LogError("actConfigInfo.Id "..actConfigInfo.Id)
|
||||
missionData = this.mission[actConfigInfo.Id]
|
||||
end
|
||||
end)
|
||||
|
@ -282,8 +281,9 @@ function this.SetActivityInfo(type, Id, state)
|
|||
end
|
||||
|
||||
function this.GetActivityOpenStatus(type)
|
||||
if this.mission[type] then
|
||||
return this.mission[type].reallyOpen == 1
|
||||
local id = this.GetActivityIdByType(type)
|
||||
if this.mission[id] then
|
||||
return this.mission[id].reallyOpen == 1
|
||||
else
|
||||
Log(string.format(Language[10002], type))
|
||||
return false
|
||||
|
|
|
@ -91,6 +91,18 @@ local type = {
|
|||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = RedPointType.People_Mirror
|
||||
},
|
||||
[3] = {
|
||||
id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽
|
||||
bg = "r_Dungeon_rendi_04",
|
||||
name = "r_Dungeon_xuanyuanbaojing",
|
||||
live = "r_Dungeon_XuanYuan_huli",
|
||||
livePos = Vector2(149, -6.33),
|
||||
liveSize = Vector2(740, 393),
|
||||
tipBg = "r_Dungeon_wujingdian",
|
||||
resetTime = string.format("<color=#DB9A9A>%s</color>",specialConfig[75].Value),
|
||||
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[76].Value),
|
||||
redPointType = -1
|
||||
},
|
||||
default = {id = -1,bg = "r_Dungeon_rendi_01"}
|
||||
}
|
||||
}
|
||||
|
@ -376,6 +388,9 @@ function this.BtnClick(id)
|
|||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.PEOPLE_MIRROR)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
elseif id == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -51,7 +51,7 @@ function EndLessCarbonPanel:BindEvent()
|
|||
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
|
||||
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
|
||||
PlayerManager.carbonType = 1
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
UIManager.OpenPanel(UIName.MainPanel)
|
||||
|
||||
--检测到上一个面板打开之后,关闭自己
|
||||
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
|
||||
|
@ -62,7 +62,6 @@ function EndLessCarbonPanel:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.btnFight, function ()
|
||||
LogGreen("开放的地图ID"..EndLessMapManager.openMapId)
|
||||
this.EnterMap()
|
||||
end)
|
||||
|
||||
|
|
|
@ -6,18 +6,18 @@ local TabBox = require("Modules/Common/TabBox")
|
|||
this._CurPageIndex =1
|
||||
local orginLayer
|
||||
local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表
|
||||
[1] = { --限时召唤
|
||||
[1] = { --破阵诛仙
|
||||
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
|
||||
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
|
||||
},
|
||||
[2] = { --限时召唤
|
||||
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
|
||||
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
|
||||
},
|
||||
[2] = { --乾坤宝盒
|
||||
[3] = { --乾坤宝盒
|
||||
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
|
||||
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
|
||||
},
|
||||
[3] = { --破阵诛仙
|
||||
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
|
||||
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
|
||||
},
|
||||
[4] = { --珍奇礼包
|
||||
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
|
||||
rpType = "",panelType = PanelType.Main,
|
||||
|
@ -47,9 +47,9 @@ function DynamicActivityPanel:InitComponent()
|
|||
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
|
||||
|
||||
this.PageList = {
|
||||
[1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||
[3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
||||
[1] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
|
||||
[2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
|
||||
[3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
|
||||
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
|
||||
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
|
||||
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),
|
||||
|
|
|
@ -17,14 +17,15 @@ local bgName
|
|||
|
||||
|
||||
local day_picture ={--数字名、文字名、奖励id
|
||||
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
|
||||
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,50,0}},
|
||||
|
||||
[1] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-470.2,0}},
|
||||
[2] = {"b_baridenglu_slogan002",2043,"b_baridenglu_slogan02",10043,{0.5,0.5,0.5},{0,-470.2,0}},
|
||||
[3] = {"b_baridenglu_slogan003",2503,"b_baridenglu_slogan03",10022,{1,1,1},{-69,91,0}},
|
||||
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,85,0}},
|
||||
[4] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[5] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[6] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[7] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
[8] = {"b_baridenglu_slogan008",2022,"b_baridenglu_slogan08",10022,{0.6,0.6,0.6},{0,-470.2,0}},
|
||||
}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
|
|
@ -196,6 +196,7 @@ function this:InitComponent()
|
|||
|
||||
-- 无尽
|
||||
this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
|
||||
this.btnEndLess:SetActive(false)
|
||||
|
||||
-- 设置
|
||||
--this.btnSet = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnSetting")
|
||||
|
@ -230,7 +231,7 @@ function this:InitComponent()
|
|||
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),
|
||||
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715),
|
||||
[FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200),
|
||||
[FUNCTION_OPEN_TYPE.TRIAL] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
[FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1000),
|
||||
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110),
|
||||
-- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110),
|
||||
[FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200),
|
||||
|
@ -655,11 +656,11 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA)
|
||||
end)
|
||||
Util.AddClick(this.btnColorfulWorld, function()
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then
|
||||
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then
|
||||
PlayerManager.carbonType = 2
|
||||
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
|
||||
else
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
||||
PopupTipPanel.ShowTip(string.format("玩家等级达到%s级开启",config.OpenRules[2]))
|
||||
end
|
||||
end)
|
||||
|
@ -705,10 +706,10 @@ function this:BindEvent()
|
|||
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ALLRANKING)
|
||||
end)
|
||||
|
||||
Util.AddClick(this.btnEndLess, function()
|
||||
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
end)
|
||||
-- Util.AddClick(this.btnEndLess, function()
|
||||
-- MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||
-- UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||
-- end)
|
||||
-- Util.AddClick(this.btnGuanxing, function()
|
||||
-- JumpManager.GoJump(1024)
|
||||
-- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ASPECT_STAR)
|
||||
|
@ -1327,10 +1328,10 @@ function this.TimeFormat()
|
|||
local dynamicAct = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||
if dynamicAct then
|
||||
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||
info = info.endTime - PlayerManager.serverTime
|
||||
info = math.floor(info/86400)
|
||||
local tempTime = info.endTime - PlayerManager.serverTime
|
||||
tempTime = math.floor(tempTime/86400)
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then
|
||||
this.DynamicActivityTime.text = info.."天"
|
||||
this.DynamicActivityTime.text = tempTime.."天"
|
||||
end
|
||||
end
|
||||
--青龙秘宝
|
||||
|
|
|
@ -118,8 +118,7 @@ end
|
|||
--切换视图
|
||||
function this.SwitchView(_index)
|
||||
if _index == 2 or _index == 3 then
|
||||
local id =ActivityGiftManager.GetActivityIdByType(8)
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(id) then
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
PopupTipPanel.ShowTip("未在活动时间范围内")
|
||||
return
|
||||
end
|
||||
|
|
|
@ -69,10 +69,10 @@ function this:RemoveListener()
|
|||
end
|
||||
this.Closefunction = function()
|
||||
Timer.New(function()
|
||||
local id = ActivityGiftManager.GetActivityIdByType(8)
|
||||
LogBlue("收到了关闭活动的消息,id:"..id)
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(id) then
|
||||
parent.SwitchView(1)
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
PopupTipPanel.ShowTip("活动已结束")
|
||||
parent:ClosePanel()
|
||||
|
||||
return
|
||||
else
|
||||
this.refresh()
|
||||
|
@ -97,13 +97,14 @@ function this:OnSortingOrderChange(sortingOrder)
|
|||
end
|
||||
|
||||
function this:OnClose()
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
|
||||
end
|
||||
function this:OnDestroy()
|
||||
itemsList={}
|
||||
if self.timer then
|
||||
self.timer :Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
end
|
||||
|
||||
this.refresh = function()
|
||||
|
@ -120,13 +121,16 @@ function this:topBar()
|
|||
local lv = QinglongSerectTreasureManager.GetLevel()
|
||||
this.lv.text = lv
|
||||
local rewardData = QinglongSerectTreasureManager.GetRewardData(lv)
|
||||
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv)
|
||||
if lv ~= 0 then
|
||||
lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
|
||||
local needScore
|
||||
if lv > 0 then
|
||||
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
|
||||
needScore = lastRewardData.needScore
|
||||
else
|
||||
needScore = 0
|
||||
end
|
||||
if rewardData.needScore ~= 0 then
|
||||
this.scoreText.text = curScore .."/"..rewardData.needScore - lastRewardData.needScore
|
||||
this.progress.fillAmount = curScore/(rewardData.needScore - lastRewardData.needScore)
|
||||
this.scoreText.text = curScore .."/"..rewardData.needScore - needScore
|
||||
this.progress.fillAmount = curScore/(rewardData.needScore - needScore)
|
||||
else
|
||||
this.scoreText.text = "最大等级"
|
||||
this.progress.fillAmount = 1
|
||||
|
@ -142,7 +146,7 @@ function this:topBar()
|
|||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel)
|
||||
end)
|
||||
local times = PrivilegeManager.GetPrivilegeRemainValue(1007)
|
||||
this.box :GetComponent("Image").enabled = ((not (treasureState == 0)) and (times > 0))
|
||||
this.box :GetComponent("Image").enabled = (treasureState == 0)
|
||||
this.extra:GetComponent("Button").enabled = ((not (treasureState == 0)) and (times > 0))
|
||||
this.canOpenExtra.gameObject:SetActive((not (treasureState == 0)) and (times > 0))
|
||||
this.openExtra:GetComponent("Animator").enabled = false
|
||||
|
@ -159,6 +163,7 @@ function this:topBar()
|
|||
Timer.New(function()
|
||||
NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
this.refresh()
|
||||
end)
|
||||
end,1.5):Start()
|
||||
|
|
|
@ -77,10 +77,10 @@ end
|
|||
|
||||
this.Closefunction = function()
|
||||
Timer.New(function()
|
||||
local id = ActivityGiftManager.GetActivityIdByType(8)
|
||||
LogBlue("收到了关闭活动的消息,id:"..id)
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(id) then
|
||||
parent.SwitchView(1)
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
PopupTipPanel.ShowTip("活动已结束")
|
||||
parent:ClosePanel()
|
||||
|
||||
return
|
||||
else
|
||||
this.refresh(curType)
|
||||
|
@ -121,6 +121,7 @@ function this:SetTopBar()
|
|||
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
||||
NetManager.GetActivityRewardRequest(-2,id,function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
this.refresh(curType)
|
||||
end)
|
||||
end,1.5):Start()
|
||||
|
@ -133,13 +134,13 @@ function this:OnSortingOrderChange(sortingOrder)
|
|||
end
|
||||
|
||||
function this:OnClose()
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
|
||||
end
|
||||
function this:OnDestroy()
|
||||
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
end
|
||||
function this.refresh(type)
|
||||
this:SetTopBar()
|
||||
|
@ -186,6 +187,7 @@ function this:SingleTask(go, rewardSingleData)
|
|||
Util.AddOnceClick(lingquButton, function()
|
||||
if state == 1 then
|
||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.TreasureOfSomeBody,sConFigData.id, function(msg)
|
||||
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
|
||||
Timer.New(function()
|
||||
this.refresh(curType)
|
||||
end,1):Start()
|
||||
|
|
|
@ -155,7 +155,7 @@ function this.GetQinglongTaskData(_curtype)
|
|||
end
|
||||
|
||||
function this.GetQinglongSerectTreasureRedPot()
|
||||
if this.activityId==0 or not ActivityGiftManager.GetActivityOpenStatus(this.activityId) then
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
return false
|
||||
end
|
||||
local state = this.GetTreasureState()
|
||||
|
@ -170,7 +170,7 @@ function this.GetQinglongSerectTreasureRedPot()
|
|||
end
|
||||
|
||||
function this.GetSerectTreasureTrailRedPot()
|
||||
if this.activityId == 0 or not ActivityGiftManager.GetActivityOpenStatus(this.activityId) then
|
||||
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
return false
|
||||
end
|
||||
for i = 1,2 do
|
||||
|
|
|
@ -2127,11 +2127,6 @@ end
|
|||
|
||||
-- 所有排行榜都走这个协议
|
||||
function this.RequestRankInfo(rankType, func, id)
|
||||
if id then
|
||||
LogGreen("rankType "..rankType.." id "..id)
|
||||
else
|
||||
LogGreen("rankType "..rankType)
|
||||
end
|
||||
local data = PlayerInfoProto_pb.RankRequest()
|
||||
data.type = rankType
|
||||
data.activiteId = id or 0
|
||||
|
|
|
@ -100,7 +100,7 @@ function GrowthGiftPage:RefreshShowData(item, data)
|
|||
local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)--当前礼包奖励的活动类型(6\7\8\9\16)(成长礼包的不同档位奖励ActivityId不同,虽然同为成长基金)
|
||||
local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, data.Id)--获取活动数据 self.context.Id
|
||||
local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--当前礼包ID(101\102\103\104\105)
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(GrowthRewardId)
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward)
|
||||
--item
|
||||
local shadow = Util.GetGameObject(item, "shadow")
|
||||
local grid = Util.GetGameObject(item, "scrollView/grid")
|
||||
|
|
|
@ -80,8 +80,7 @@ function GrowthGiftTaskItem:SetValue()
|
|||
end
|
||||
|
||||
function GrowthGiftTaskItem:OnBtnDealClicked()
|
||||
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(GrowthRewardId)
|
||||
local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward)
|
||||
local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)
|
||||
if not openStatus or (goods and goods.buyTimes < 1) then
|
||||
PopupTipPanel.ShowTip(Language[11474])
|
||||
|
|
|
@ -13,35 +13,45 @@ MonoBehaviour:
|
|||
m_Name: DataConfigMD5Record
|
||||
m_EditorClassIdentifier:
|
||||
_keys:
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaRobotSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AdventureReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BeginnerTask.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaBattleReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ActivityRankingReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AreaConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ActivityDropReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleTask.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AchievementConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ErrorCodeHint.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ActivityRankingReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AchievementConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FoodsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AdventureConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GameSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GlobalActivity.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildBossConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildHelpConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FakeBattle.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AdventureReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EndlessDifficulty.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EndlessMapConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipStarsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSignSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildRedPackConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildHelpConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildBossConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GlobalSystemConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipPropertyPool.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GlobalActivity.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GameSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FoodsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuideConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AreaConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx
|
||||
|
@ -49,177 +59,177 @@ MonoBehaviour:
|
|||
- F:\JL_data_execl\master_develop/base_data\GuildSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildWarConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BlessingRewardPool.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChampionshipSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyRankConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BeStronger.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JumpConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LevelSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroRankupGroup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroSacrifice.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildCheckpointRank.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AudioConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuideConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeStarBox.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FakeBattle.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ExpeditionSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BuffEffectConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChampionshipReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MainMapIconConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MazeTreasure.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LuxuryFund.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerAppearance.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FloodConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerRole.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonthcardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LuckyCatConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSuiteConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotterySetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EndlessDifficulty.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RaceTowerConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\QAConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\OptionAddCondition.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BlessingConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DialRewardSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MissionEventsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LoginPosterConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ErrorCodeHint.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AccomplishmentConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonsterViewConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroRankupConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelRankupConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\CombatControl.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DailyTasksConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PropertyConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RandomName.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipStarsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EndlessMapConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RecommendTeam.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaRobotSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DialRewardSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DialRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ItemConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DailyChallengeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSign.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSignSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SpecialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\StoreTypeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RunesPoolConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SevenDaysScore.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RunesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SevenDaysActivity.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\VipLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TestWelfare.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SystemMessageConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SeverConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SignInConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DialogueViewConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\UIConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChampionshipReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeStarBox.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\CombatControl.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChapterOptionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BuffEffectConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyRankConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleTask.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeMapConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BloodyBattleSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BlessingRewardPool.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BlessingConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BeStronger.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChallengeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\BeginnerTask.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ActivityRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroReturn.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialKillConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipPropertyPool.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RoleConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DialogueViewConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AudioConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\FloodConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotterySetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\OptionAddCondition.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonthcardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JumpConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RewardItemConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LevelSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelResonanceConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroSacrifice.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LoginPosterConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroRankupConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SystemMessageConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroRankupGroup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TestWelfare.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SeverConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LuckyCatConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotterySpecialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MazeTreasureSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LuxuryFund.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MazeTreasure.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaBattleReward.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PropertyConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MainMapIconConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerRole.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ChampionshipSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MissionEventsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SpecialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerAppearance.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RecommendTeam.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonsterViewConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RandomName.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArenaRobotConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SignInConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipSign.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\AdventureConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SevenDaysScore.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialKillConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialGameConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RoleConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialQuestionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureTaskConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\LotteryRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RaceTowerConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\HeroReturn.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RunesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildTechnology.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\JewelRankupConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PassiveSkillConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\StoreTypeConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\QAConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RunesPoolConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialwelfareConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SevenDaysActivity.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\UIConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MapPointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\GuildTechnology.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ArtResourcesConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopSetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\TrialConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\ItemConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\VipLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SkillConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\OptionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\StoreConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EventPointConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\SkillLogicConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\RewardGroup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\WorkShopTechnology.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonsterGroup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\EquipTalismana.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\OptionConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonsterGroup.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MainLevelConfig.xlsx
|
||||
- F:\JL_data_execl\master_develop/base_data\MonsterConfig.xlsx
|
||||
_values:
|
||||
- 2652005642
|
||||
- 3947848933
|
||||
- 613479935
|
||||
- 755222564
|
||||
- 2296996310
|
||||
- 3252026258
|
||||
- 1924824445
|
||||
- 1048362391
|
||||
- 413963702
|
||||
- 3591751192
|
||||
- 2131302457
|
||||
- 353142748
|
||||
- 3507522218
|
||||
- 1448464981
|
||||
- 1048362391
|
||||
- 185330122
|
||||
- 4055477448
|
||||
- 353142748
|
||||
- 1702782288
|
||||
- 1882717235
|
||||
- 3403387611
|
||||
- 1023901955
|
||||
- 587159277
|
||||
- 1848421159
|
||||
- 421974146
|
||||
- 1240880521
|
||||
- 2213954267
|
||||
- 173728414
|
||||
- 3943131728
|
||||
- 3894020600
|
||||
- 3153364400
|
||||
- 3879177690
|
||||
- 3674283409
|
||||
- 1382260277
|
||||
- 3224705358
|
||||
- 613479935
|
||||
- 610179155
|
||||
- 583891024
|
||||
- 1072349642
|
||||
- 2296996310
|
||||
- 494399256
|
||||
- 1402356663
|
||||
- 3517900411
|
||||
- 2568046174
|
||||
- 2294226303
|
||||
- 4124958540
|
||||
- 475620184
|
||||
- 3153364400
|
||||
- 427098595
|
||||
- 3894020600
|
||||
- 173728414
|
||||
- 1029526056
|
||||
- 2213954267
|
||||
- 3879177690
|
||||
- 3153107712
|
||||
- 3943131728
|
||||
- 1240880521
|
||||
- 3228740331
|
||||
- 421974146
|
||||
- 3403387611
|
||||
- 4202904691
|
||||
- 413963702
|
||||
- 1442255327
|
||||
- 1996735664
|
||||
- 1468913191
|
||||
|
@ -227,144 +237,134 @@ MonoBehaviour:
|
|||
- 3472737567
|
||||
- 3585263874
|
||||
- 2445182985
|
||||
- 939963957
|
||||
- 3338153430
|
||||
- 1023901955
|
||||
- 3548626589
|
||||
- 727009153
|
||||
- 3597116301
|
||||
- 2613230219
|
||||
- 3267409829
|
||||
- 3705022903
|
||||
- 2050621784
|
||||
- 1493914227
|
||||
- 1382260277
|
||||
- 306567717
|
||||
- 3228740331
|
||||
- 230994945
|
||||
- 2773656346
|
||||
- 4202904691
|
||||
- 1565259591
|
||||
- 3224705358
|
||||
- 3442665542
|
||||
- 3674283409
|
||||
- 1572157444
|
||||
- 1705732776
|
||||
- 2605131572
|
||||
- 2759035733
|
||||
- 4243693008
|
||||
- 903221398
|
||||
- 260126611
|
||||
- 866186388
|
||||
- 2903827109
|
||||
- 2534897219
|
||||
- 3766499137
|
||||
- 932779961
|
||||
- 3641128642
|
||||
- 319164499
|
||||
- 1786980484
|
||||
- 2479323017
|
||||
- 1029526056
|
||||
- 3779746387
|
||||
- 4124958540
|
||||
- 4028339075
|
||||
- 610179155
|
||||
- 4114437015
|
||||
- 2192034346
|
||||
- 683415129
|
||||
- 1108804808
|
||||
- 3033812632
|
||||
- 595190689
|
||||
- 2568046174
|
||||
- 1122169681
|
||||
- 4198004043
|
||||
- 3625815197
|
||||
- 1645363352
|
||||
- 1448464981
|
||||
- 427098595
|
||||
- 515856748
|
||||
- 3746847302
|
||||
- 274496341
|
||||
- 980629513
|
||||
- 4138292608
|
||||
- 3746782731
|
||||
- 295715991
|
||||
- 2297407361
|
||||
- 348895386
|
||||
- 1402356663
|
||||
- 2951431547
|
||||
- 2867634862
|
||||
- 568553271
|
||||
- 1393544882
|
||||
- 1173373930
|
||||
- 38983593
|
||||
- 61557988
|
||||
- 494399256
|
||||
- 1072349642
|
||||
- 371577342
|
||||
- 460607005
|
||||
- 2294226303
|
||||
- 583891024
|
||||
- 903221398
|
||||
- 2652005642
|
||||
- 4198004043
|
||||
- 3566908170
|
||||
- 249002466
|
||||
- 2385302333
|
||||
- 1774803500
|
||||
- 3255901169
|
||||
- 1790592577
|
||||
- 3517900411
|
||||
- 4245386636
|
||||
- 185551317
|
||||
- 804383039
|
||||
- 1952787401
|
||||
- 1155516420
|
||||
- 160427834
|
||||
- 3951547032
|
||||
- 98336120
|
||||
- 241982493
|
||||
- 2405621183
|
||||
- 4291486445
|
||||
- 297530923
|
||||
- 2748321716
|
||||
- 29725303
|
||||
- 2023730508
|
||||
- 1791256076
|
||||
- 832245724
|
||||
- 2777840995
|
||||
- 4243693008
|
||||
- 1705732776
|
||||
- 1565259591
|
||||
- 348895386
|
||||
- 1572157444
|
||||
- 3033812632
|
||||
- 2605131572
|
||||
- 3507522218
|
||||
- 3548626589
|
||||
- 2131302457
|
||||
- 4055477448
|
||||
- 4138292608
|
||||
- 230994945
|
||||
- 2050621784
|
||||
- 939963957
|
||||
- 1108804808
|
||||
- 2613230219
|
||||
- 2759035733
|
||||
- 755222564
|
||||
- 3746782731
|
||||
- 2403795715
|
||||
- 322704922
|
||||
- 3092801350
|
||||
- 1849213789
|
||||
- 898095515
|
||||
- 1115488926
|
||||
- 967064327
|
||||
- 811712663
|
||||
- 739739032
|
||||
- 2854113790
|
||||
- 141295447
|
||||
- 3153107712
|
||||
- 1310766065
|
||||
- 110435588
|
||||
- 1791256076
|
||||
- 2773656346
|
||||
- 3766499137
|
||||
- 4028339075
|
||||
- 249002466
|
||||
- 683415129
|
||||
- 1786980484
|
||||
- 3267409829
|
||||
- 727009153
|
||||
- 1924824445
|
||||
- 918165203
|
||||
- 2656593449
|
||||
- 3048495520
|
||||
- 1321320575
|
||||
- 884120277
|
||||
- 3442665542
|
||||
- 3705022903
|
||||
- 3597116301
|
||||
- 306567717
|
||||
- 460607005
|
||||
- 1645363352
|
||||
- 274496341
|
||||
- 297530923
|
||||
- 1493914227
|
||||
- 4291486445
|
||||
- 2748321716
|
||||
- 2479323017
|
||||
- 1849213789
|
||||
- 3779746387
|
||||
- 3092801350
|
||||
- 3951547032
|
||||
- 3746847302
|
||||
- 2903827109
|
||||
- 295715991
|
||||
- 866186388
|
||||
- 3252026258
|
||||
- 2867634862
|
||||
- 2023730508
|
||||
- 260126611
|
||||
- 3641128642
|
||||
- 3338153430
|
||||
- 1122169681
|
||||
- 3625815197
|
||||
- 4245386636
|
||||
- 2534897219
|
||||
- 3255901169
|
||||
- 568553271
|
||||
- 371577342
|
||||
- 515856748
|
||||
- 38983593
|
||||
- 1393544882
|
||||
- 3947848933
|
||||
- 29725303
|
||||
- 1790592577
|
||||
- 1848421159
|
||||
- 1952787401
|
||||
- 898095515
|
||||
- 739739032
|
||||
- 1982645928
|
||||
- 1173373930
|
||||
- 1310766065
|
||||
- 2656593449
|
||||
- 884120277
|
||||
- 2297407361
|
||||
- 4114437015
|
||||
- 322704922
|
||||
- 1155516420
|
||||
- 625696080
|
||||
- 2018779253
|
||||
- 3663717884
|
||||
- 312894044
|
||||
- 980629513
|
||||
- 1115488926
|
||||
- 141295447
|
||||
- 20447752
|
||||
- 266440734
|
||||
- 185551317
|
||||
- 319164499
|
||||
- 595190689
|
||||
- 2192034346
|
||||
- 804383039
|
||||
- 2854113790
|
||||
- 160427834
|
||||
- 832245724
|
||||
- 2171283147
|
||||
- 811712663
|
||||
- 1321320575
|
||||
- 312894044
|
||||
- 61557988
|
||||
- 3663717884
|
||||
- 266440734
|
||||
- 3048495520
|
||||
- 2385302333
|
||||
- 2405621183
|
||||
- 110435588
|
||||
- 967064327
|
||||
- 98336120
|
||||
- 2777840995
|
||||
- 241982493
|
||||
- 1131233998
|
||||
- 3754357833
|
||||
- 2018779253
|
||||
- 3747490777
|
||||
- 80254637
|
||||
- 3503683771
|
||||
- 3868511836
|
||||
- 2453679101
|
||||
- 29089457
|
||||
- 4033164304
|
||||
- 3754357833
|
||||
- 29089457
|
||||
- 1397243523
|
||||
- 2992446060
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue