冲突解决提交

dev_chengFeng
jiaoyangna 2020-07-25 15:18:07 +08:00
commit 6742056a93
15 changed files with 2793 additions and 397 deletions

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5ab9b102649b1914d970131f80445016
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5163,6 +5163,14 @@ MonoBehaviour:
extension: .png
resPathIndex: 28
resAbNameIndex: 14
- resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A1"
extension: .jpg
resPathIndex: 28
resAbNameIndex: 14
- resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A2"
extension: .jpg
resPathIndex: 28
resAbNameIndex: 14
- resName: r_shouchong_lingqu_01
extension: .png
resPathIndex: 29
@ -9455,18 +9463,6 @@ MonoBehaviour:
extension: .jpg
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_duiwudihong
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_duiwudizhuanshi
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_hongse
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_jia
extension: .png
resPathIndex: 54
@ -9547,10 +9543,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_zhuanshi
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: r_tongyong_zise
extension: .png
resPathIndex: 54
@ -9723,38 +9715,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui.xuanzhongkuang
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_hong
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_huang
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_huise
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_lan
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_lvse
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_zhuangshi
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_biandui_zi
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_tongyong_topkaung
extension: .png
resPathIndex: 54
@ -9763,14 +9723,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_zhandoukuang_hong10
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: t_zhandoukuang_zhuangshixx_png
extension: .png
resPathIndex: 54
resAbNameIndex: 28
- resName: ui_1un
extension: .png
resPathIndex: 54
@ -28495,6 +28447,14 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 158
resAbNameIndex: 1546
- resName: "\u7ADE\u6280\u573A-3-7-18"
extension: .jpg
resPathIndex: 158
resAbNameIndex: 1546
- resName: ArenaTopMatchGuessTipViewPopup
extension: .prefab
resPathIndex: 159
resAbNameIndex: 1547
- resName: ArenaTopMatchPanel
extension: .prefab
resPathIndex: 159
@ -28507,6 +28467,10 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 159
resAbNameIndex: 1547
- resName: "QQ\u56FE\u724720200723144602"
extension: .png
resPathIndex: 159
resAbNameIndex: 1547
- resName: TopMatchPlayBattleAinSelectPopup
extension: .prefab
resPathIndex: 159
@ -28515,6 +28479,14 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 159
resAbNameIndex: 1547
- resName: "\u5DC5\u5CF0\u8D5B-\u6539\u72482"
extension: .jpg
resPathIndex: 159
resAbNameIndex: 1547
- resName: "\u5DC5\u5CF0\u8D5B-\u7ADE\u731C2"
extension: .jpg
resPathIndex: 159
resAbNameIndex: 1547
- resName: BagPanel
extension: .prefab
resPathIndex: 160
@ -29383,6 +29355,14 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 208
resAbNameIndex: 1590
- resName: "\u5B9D\u7269\u5206\u89E31"
extension: .jpg
resPathIndex: 208
resAbNameIndex: 1590
- resName: "\u5B9D\u7269\u5206\u89E32"
extension: .jpg
resPathIndex: 208
resAbNameIndex: 1590
- resName: RewardBoxPanel
extension: .prefab
resPathIndex: 209
@ -29699,10 +29679,6 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 224
resAbNameIndex: 1606
- resName: starGrid
extension: .prefab
resPathIndex: 224
resAbNameIndex: 1606
- resName: UpView
extension: .prefab
resPathIndex: 224
@ -41570,6 +41546,7 @@ MonoBehaviour:
- lz4/fonts/powernewfont.unity3d
- lz4/fonts/ragefont.unity3d
- lz4/icons.unity3d
- lz4/prefabs/ui/view.unity3d
- lz4/publicartres/animations.unity3d
- lz4/publicartres/materials.unity3d
- lz4/publicartres/models.unity3d
@ -41824,7 +41801,6 @@ MonoBehaviour:
- lz4/rtexture/cardtexture1.unity3d
- assetBundleName: lz4/prefabs/ui/handbook.unity3d
dependences:
- lz4/atlas/cardatlas.unity3d
- lz4/atlas/popupatlas.unity3d
- lz4/atlas/publicatlas.unity3d
- lz4/atlas/roleinfoatlas.unity3d
@ -42290,7 +42266,6 @@ MonoBehaviour:
- lz4/bg/b_baowuxitong_beijin.unity3d
- lz4/bg/c_chengyuan_beijin.unity3d
- lz4/bg/jl-jinengkuang.unity3d
- lz4/bg/r_hero_bg_002.unity3d
- lz4/bg/r_hero_jinjiechenggongmenghei.unity3d
- lz4/dynamicatlas/r_fabao_shangbg.unity3d
- lz4/dynamicatlas/r_fabao_xiaobg.unity3d

View File

@ -130,7 +130,7 @@ GetHeroCardStarBg = {
[7] = "t_chengyuankuang_hong",
[8] = "t_chengyuankuang_hong",
[9] = "t_chengyuankuang_hong",
[10] = "t_chengyuankuang_zhaunshi",
[10] = "t_chengyuankuang_hong",
[11] = "t_chengyuankuang_zhaunshi",
[12] = "t_chengyuankuang_zhaunshi",
[13] = "t_chengyuankuang_zhaunshi",
@ -151,7 +151,7 @@ GetBattleHeroCardStarBg = {
[7] = "t_zhandoukuang_hong",
[8] = "t_zhandoukuang_hong",
[9] = "t_zhandoukuang_hong",
[10] = "t_zhandoukuang_zhuangshi",
[10] = "t_zhandoukuang_hong",
[11] = "t_zhandoukuang_zhuangshi",
[12] = "t_zhandoukuang_zhuangshi",
[13] = "t_zhandoukuang_zhuangshi",
@ -172,7 +172,7 @@ GetFormationHeroCardStarBg = {
[7] = "t_biandui_hong",
[8] = "t_biandui_hong",
[9] = "t_biandui_hong",
[10] = "t_biandui_zhuangshi",
[10] = "t_biandui_hong",
[11] = "t_biandui_zhuangshi",
[12] = "t_biandui_zhuangshi",
[13] = "t_biandui_zhuangshi",
@ -193,7 +193,7 @@ GetHeroCardStarFg = {
[7] = "t_zhandoukuang_hong002",
[8] = "t_zhandoukuang_hong002",
[9] = "t_zhandoukuang_hong002",
[10] = "t_zhandoukuang_zhuangshi002",
[10] = "t_zhandoukuang_hong002",
[11] = "t_zhandoukuang_zhuangshi002",
[12] = "t_zhandoukuang_zhuangshi002",
[13] = "t_zhandoukuang_zhuangshi002",
@ -214,7 +214,7 @@ GetHeroCardStarZs = {
[7] = "t_zhandoukuang_hong01",
[8] = "t_zhandoukuang_hong01",
[9] = "t_zhandoukuang_hong01",
[10] = "t_zhandoukuang_zhuanshi01",
[10] = "t_zhandoukuang_hong01",
[11] = "t_zhandoukuang_zhuanshi01",
[12] = "t_zhandoukuang_zhuanshi01",
[13] = "t_zhandoukuang_zhuanshi01",

View File

@ -760,8 +760,10 @@ function GetHeroChipQuantityImageByquality(quality)
end
end
--通过Hero稀有度读取背景框(小)
function GetHeroQuantityImageByquality(quality)
if quality == 0 or quality == 1 then
function GetHeroQuantityImageByquality(quality,star)
if star and star > 5 then
return "r_characterbg_gules"
elseif quality == 0 or quality == 1 then
return "r_characterbg_gray"
elseif quality == 2 then
return "r_characterbg_green"

View File

@ -323,6 +323,7 @@ UIName = {
XuanYuanMirrorPanelList = 322,--轩辕宝镜单个宝镜界面
CarbonTypePanelV3 = 323,--轩辕宝镜单个宝镜界面
TopMatchPlayBattleAinSelectPopup = 324,--巅峰战淘汰赛赛程记录回放
ArenaTopMatchGuessTipViewPopup = 325,--巅峰赛竞猜结果弹窗
}

View File

@ -0,0 +1,201 @@
require("Base/BasePanel")
ArenaTopMatchGuessTipViewPopup = Inherit(BasePanel)
local this = ArenaTopMatchGuessTipViewPopup
local betBattleInfo = nil
--倒计时
local count = 10
--标题
local resultText = {[0] = Language[10134], [1] = Language[10133]}
local resultColor = {
[0] = Color.New(165 / 255, 165 / 255, 165 / 255, 1),
[1] = Color.New(232 / 255, 216 / 255, 186 / 255, 1)
}
--竞猜胜负图片
local resultImage = {
[0] = {name = "UI_effect_JJC_JieSuan_ShiBai_png"},
[1] = {name = "UI_effect_JJC_JieSuan_ShengLi_png"}
}
--头像容器
local headList = {}
--竞猜币ItemId
local GUESS_COIN = ArenaTopMatchManager.GetGuessCoinID()
--竞猜币动态显示持续时长
local duration=2
--计时间隔
local interval=0.1
--竞猜币数量浮动图
local upAndDownImage={[0]="r_hero_zhanlixiajiang_png",[1]="r_hero_zhanlishangsheng_png"}
--竞猜结果
local endResult = -1
--初始化组件(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:InitComponent()
this.title = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/Title"):GetComponent("Text")
this.backBtn = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BackBtn")
this.coinNum = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/CoinNum"):GetComponent("Text")
this.coinState = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/CoinNum/CoinState"):GetComponent("Image")
this.time = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/Time"):GetComponent("Text")
this.leftName = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Left/Grade/Name"):GetComponent("Text")
this.leftHead = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Left/Grade/Head")
this.leftMark=Util.GetGameObject(self.gameObject,"ATM_GuessTipView/BattlePopup/Left/Grade/Mark"):GetComponent("Image")
this.leftResult = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Left/Result"):GetComponent("Image")
this.rightName = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Right/Grade/Name"):GetComponent("Text")
this.rightHead = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Right/Grade/Head")
this.rightMark=Util.GetGameObject(self.gameObject,"ATM_GuessTipView/BattlePopup/Right/Grade/Mark"):GetComponent("Image")
this.rightResult = Util.GetGameObject(self.gameObject, "ATM_GuessTipView/BattlePopup/Right/Result"):GetComponent("Image")
end
--绑定事件(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:BindEvent()
Util.AddClick(this.backBtn,function()
self:ClosePanel()
end)
end
--添加事件监听(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:AddListener()
end
--移除事件监听(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:RemoveListener()
end
--界面打开时调用(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:OnOpen(...)
this.TimeCountDown()
local IsCanBet = ArenaTopMatchManager.IsCanBet()
LogGreen("IsCanBet "..tostring(IsCanBet))
if IsCanBet then
betBattleInfo = ArenaTopMatchManager.GetBetBattleInfo()
local myBetTarget = ArenaTopMatchManager.GetMyBetTarget()
local isBetBlue = myBetTarget == betBattleInfo.myInfo.uid
local isBetRed = myBetTarget == betBattleInfo.enemyInfo.uid
if betBattleInfo.result == -1 then return end
endResult = -1
--设置标题
if isBetBlue then
local result=betBattleInfo.result
this.title.text = resultText[result]
this.title.color = resultColor[result]
this.coinState.sprite=Util.LoadSprite(upAndDownImage[result])
endResult = result
end
if isBetRed then
local result=(betBattleInfo.result+1)%2
this.title.text = resultText[result]
this.title.color = resultColor[result]
this.coinState.sprite=Util.LoadSprite(upAndDownImage[result])
endResult = result
end
this.coinState:SetNativeSize()
--设置玩家名
this.leftName.text = betBattleInfo.myInfo.name
this.rightName.text = betBattleInfo.enemyInfo.name
this.SetHead(this.leftHead, betBattleInfo.myInfo)
this.SetHead(this.rightHead, betBattleInfo.enemyInfo)
this.SetResultIcon(this.leftResult, this.rightResult, betBattleInfo.result)
--设置押注标志
this.leftMark.enabled=isBetBlue
this.rightMark.enabled=isBetRed
--设置竞猜币
this.SetCoin()
end
end
--倒计时
function this.TimeCountDown()
if this.timer then
this.timer:Stop()
this.timer = nil
end
count = 10
if not this.timer then
this.timer = Timer.New(function()
this.time.text = string.format(Language[10163], count)
count = count - 1
if count <= 0 then
count = 0
this.timer:Stop()
this.timer = nil
this:ClosePanel()
end
end, 1, -1, true)
this.timer:Start()
end
end
--设置头像
function this.SetHead(head, data)
if not headList[head] then
headList[head] = CommonPool.CreateNode(POOL_ITEM_TYPE.PLAYER_HEAD, head)
end
headList[head]:Reset()
headList[head]:SetScale(Vector3.one * 0.7)
headList[head]:SetHead(data.head)
headList[head]:SetFrame(data.headFrame)
headList[head]:SetLevel(data.level)
end
--设置胜负图片
function this.SetResultIcon(obj1, obj2, result)
if result == 1 then
obj1.sprite = Util.LoadSprite(resultImage[1].name)
obj2.sprite = Util.LoadSprite(resultImage[0].name)
elseif result == 0 then
obj1.sprite = Util.LoadSprite(resultImage[0].name)
obj2.sprite = Util.LoadSprite(resultImage[1].name)
end
end
--设置竞猜币
function this.SetCoin()
local oldNum= ArenaTopMatchManager.GetCoinNum() + ArenaTopMatchManager.GetMyBetCoins()
local newNum = BagManager.GetItemCountById(GUESS_COIN)
LogRed("endResult "..endResult.." oldNum "..oldNum.." newNum "..newNum.." GetCoinNum "..ArenaTopMatchManager.GetCoinNum().." GetMyBetCoins "..ArenaTopMatchManager.GetMyBetCoins())
local tempNum=oldNum
if this.coinTimer then
this.coinTimer:Stop()
this.coinTimer=nil
end
if not this.coinTimer then
this.coinTimer=Timer.New(function()
local addNum = math.floor(tonumber((newNum-tempNum)/(duration/interval)))
if newNum-tempNum > 0 then
addNum = addNum > 0 and addNum or 1
end
oldNum=oldNum+addNum
if oldNum>=newNum then
oldNum=newNum
this.coinTimer:Stop()
end
LogGreen("oldNum "..oldNum)
this.coinNum.text=string.format(Language[10164],oldNum)
end,interval,-1,true)
this.coinTimer:Start()
end
end
--界面关闭时调用(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:OnClose()
if this.timer then
this.timer:Stop()
this.timer = nil
end
if this.coinTimer then
this.coinTimer:Stop()
this.coinTimer=nil
end
end
--界面销毁时调用(用于子类重写)
function ArenaTopMatchGuessTipViewPopup:OnDestroy()
end
return ArenaTopMatchGuessTipViewPopup

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: eb559649fd894024d974c541d5864ccb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -89,6 +89,7 @@ function this.RequestTopMatchBaseInfo(func)
this.myBattleInfo = msg.championBattleInfo
isChange = false
this.BaseDataEndTimeCountDown()
this.RefreshBaseInfo()
-- 发送更新事件
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate)
@ -108,6 +109,7 @@ function this.UpdateTopMatchStage(msg)
-- 获取新的阶段信息
this.baseInfo.progress = msg.progress
this.baseInfo.endTime = msg.endTime
this.BaseDataEndTimeCountDown()
Log(string.format(Language[10109],
this.baseInfo.joinState, this.baseInfo.progress, this.baseInfo.endTime, this.baseInfo.myrank))
@ -349,10 +351,10 @@ end
-- 竞猜成功回调
function this.OnGuessSuccess(msg)
LogGreen("竞猜成功回调")
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
if MapManager.isInMap or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.ArenaTopMatchPanel) then return end--在关卡里 副本里不弹 新加巅峰赛界面不弹
UIManager.OpenPanel(UIName.GuessCoinDropPopup, msg.roundTimes, msg.itemId, msg.itemNum)
-- LogGreen("竞猜成功回调")
-- if this.isLogin then return end--上来就弹新关卡界面 所以不弹
-- if MapManager.isInMap or UIManager.IsOpen(UIName.BattlePanel) or UIManager.IsOpen(UIName.ArenaTopMatchPanel) then return end--在关卡里 副本里不弹 新加巅峰赛界面不弹
-- UIManager.OpenPanel(UIName.GuessCoinDropPopup, msg.roundTimes, msg.itemId, msg.itemNum)
end
-- 判断是否可以竞猜
@ -945,6 +947,7 @@ function this.GetCurTabIndex()
end
--是否显示竞猜结果
function this.SetcurIsShowDoGuessPopup(isShow)
LogRed("SetcurIsShowDoGuessPopup "..tostring(isShow))
this.curIsShowDoGuessPopup = isShow
end
function this.GetcurIsShowDoGuessPopup()
@ -1011,5 +1014,65 @@ function this.ChangeData(type)
end
end
end
this.timer = Timer.New()
--计时弹竞猜结果
function this.BaseDataEndTimeCountDown()
-- 计时器
if this.timer then
this.timer:Stop()
this.timer = nil
end
if not this.timer then
local function _UpdateTime()
local isOpen = ArenaTopMatchManager.IsTopMatchActive()
if this.baseInfo.progress == -2 then
return
end
if isOpen then
local leftTime = this.baseInfo.endTime - PlayerManager.serverTime
if leftTime <= 3 then
-- Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdateShowTip)
this.RefreshGuessTipView()
end
if leftTime <= 0 then
if this.timer then
this.timer:Stop()
this.timer = nil
end
end
end
end
_UpdateTime()
this.timer = Timer.New(_UpdateTime, 1 , -1, true)
this.timer:Start()
end
end
--刷新竞猜提示
function this.RefreshGuessTipView()
LogGreen("竞猜成功回调")
if this.isLogin then return end--上来就弹新关卡界面 所以不弹
if MapManager.isInMap or UIManager.IsOpen(UIName.BattlePanel) then return end--在关卡里 副本里不弹
local IsCanBet = ArenaTopMatchManager.IsCanBet()
if IsCanBet then -- 判断是否有竞猜信息
local myBetTarget = ArenaTopMatchManager.GetMyBetTarget()
local IsBeted = myBetTarget and myBetTarget ~= 0
local isShow = ArenaTopMatchManager.GetcurIsShowDoGuessPopup()
LogGreen("isShow "..tostring(isShow))
-- if
local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(2)
local isBattleEnd = (upWinNum >= 2 or downWinNum >= 2)
LogRed("三局两胜是否结束 "..tostring(isBattleEnd))
--打开竞猜提示(处于秋后算账)
if IsBeted and isShow and (isBattleEnd and this.baseInfo.battleStage == TOP_MATCH_STAGE.ELIMINATION or this.baseInfo. battleStage == TOP_MATCH_STAGE.CHOOSE) then
if this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END then
LogGreen("开始弹竞猜结果")
ArenaTopMatchManager.SetcurIsShowDoGuessPopup(false)
UIManager.OpenPanel(UIName.ArenaTopMatchGuessTipViewPopup)
-- matchPanel.OpenView(6)
end
end
end
end
----------------------
return this

View File

@ -110,10 +110,10 @@ function this.battleDetailBtnClick(isShowTip)
arg.red.name = betBattleInfo.enemyInfo.name
arg.red.head = betBattleInfo.enemyInfo.head
arg.red.frame = betBattleInfo.enemyInfo.headFrame
UIManager.OpenPanel(UIName.ArenaResultPopup, arg,
function()
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdateShowTip)
end
UIManager.OpenPanel(UIName.ArenaResultPopup, arg
-- ,function()
-- Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdateShowTip)
-- end
)
end)
end
@ -283,29 +283,29 @@ function this.RefreshBetRateShow()
end
end
--刷新竞猜提示
function this.RefreshGuessTipView()
local IsCanBet = ArenaTopMatchManager.IsCanBet()
if IsCanBet then -- 判断是否有竞猜信息
local myBetTarget = ArenaTopMatchManager.GetMyBetTarget()
local IsBeted = myBetTarget and myBetTarget ~= 0
local isShow = ArenaTopMatchManager.GetcurIsShowDoGuessPopup()
LogGreen("isShow "..tostring(isShow))
-- if
local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(2)
local isBattleEnd = (upWinNum >= 2 or downWinNum >= 2)
LogRed("三局两胜是否结束 "..tostring(isBattleEnd))
--打开竞猜提示(处于秋后算账)
if IsBeted and isShow and (isBattleEnd and battleStage == TOP_MATCH_STAGE.ELIMINATION or battleStage == TOP_MATCH_STAGE.CHOOSE) then
local baseInfo = ArenaTopMatchManager.GetBaseData()
if baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END then
LogGreen("开始弹竞猜结果")
ArenaTopMatchManager.SetcurIsShowDoGuessPopup(false)
matchPanel.OpenView(6)
end
end
end
end
-- --刷新竞猜提示
-- function this.RefreshGuessTipView()
-- local IsCanBet = ArenaTopMatchManager.IsCanBet()
-- if IsCanBet then -- 判断是否有竞猜信息
-- local myBetTarget = ArenaTopMatchManager.GetMyBetTarget()
-- local IsBeted = myBetTarget and myBetTarget ~= 0
-- local isShow = ArenaTopMatchManager.GetcurIsShowDoGuessPopup()
-- LogGreen("isShow "..tostring(isShow))
-- -- if
-- local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(2)
-- local isBattleEnd = (upWinNum >= 2 or downWinNum >= 2)
-- LogRed("三局两胜是否结束 "..tostring(isBattleEnd))
-- --打开竞猜提示(处于秋后算账)
-- if IsBeted and isShow and (isBattleEnd and battleStage == TOP_MATCH_STAGE.ELIMINATION or battleStage == TOP_MATCH_STAGE.CHOOSE) then
-- local baseInfo = ArenaTopMatchManager.GetBaseData()
-- if baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END then
-- LogGreen("开始弹竞猜结果")
-- ArenaTopMatchManager.SetcurIsShowDoGuessPopup(false)
-- matchPanel.OpenView(6)
-- end
-- end
-- end
-- end
--界面关闭时调用(用于子类重写)
function ATM_GuessView:OnClose()

View File

@ -587,7 +587,7 @@ function this.SingleHeroDataShow(_go, _heroData)
local yuanImage = Util.GetGameObject(go, "yuanImage")
local choosedObj = Util.GetGameObject(go, "choosed")
local hpExp = Util.GetGameObject(go, "hpExp")
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality))
frame.sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star))
icon.sprite=Util.LoadSprite(heroData.icon)
lv.text=heroData.lv
pro.sprite= Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))

View File

@ -551,6 +551,7 @@ end
---设置跑马灯物品显示 func确保先生成itemview 再置灰
function this.SetItemViewShow(data,func)
for i = 1, #this.itemViewList do
LogPink(data[i].luckId)
local tab={LuckyTurnTableManager.dialRewardConfig[data[i].luckId].Reward[1],LuckyTurnTableManager.dialRewardConfig[data[i].luckId].Reward[2]}
this.itemViewList[i]:OnOpen(false, {tab[1],tab[2]},1, false, false, false, sortingOrder)
end

View File

@ -13,351 +13,351 @@ MonoBehaviour:
m_Name: DataConfigMD5Record
m_EditorClassIdentifier:
_keys:
- F:\jielingNew/data_execl/base_data\BlessingConfig.xlsx
- F:\jielingNew/data_execl/base_data\BeStronger.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleReward.xlsx
- F:\jielingNew/data_execl/base_data\BeginnerTask.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleSetting.xlsx
- F:\jielingNew/data_execl/base_data\AudioConfig.xlsx
- F:\jielingNew/data_execl/base_data\BloodyMessagesConfig.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleTreasure.xlsx
- F:\jielingNew/data_execl/base_data\BloodyRankConfig.xlsx
- F:\jielingNew/data_execl/base_data\BuffEffectConfig.xlsx
- F:\jielingNew/data_execl/base_data\AreaConfig.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRankingReward.xlsx
- F:\jielingNew/data_execl/base_data\AchievementConfig.xlsx
- F:\jielingNew/data_execl/base_data\AdventureConfig.xlsx
- F:\jielingNew/data_execl/base_data\AdventureReward.xlsx
- F:\jielingNew/data_execl/base_data\AreaConfig.xlsx
- F:\jielingNew/data_execl/base_data\ArenaBattleReward.xlsx
- F:\jielingNew/data_execl/base_data\ArenaReward.xlsx
- F:\jielingNew/data_execl/base_data\DialRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\DailyTasksConfig.xlsx
- F:\jielingNew/data_execl/base_data\ArenaRobotSetting.xlsx
- F:\jielingNew/data_execl/base_data\ArenaRobotConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsBoxPools.xlsx
- F:\jielingNew/data_execl/base_data\DailyChallengeConfig.xlsx
- F:\jielingNew/data_execl/base_data\BeginnerTask.xlsx
- F:\jielingNew/data_execl/base_data\AudioConfig.xlsx
- F:\jielingNew/data_execl/base_data\BlessingConfig.xlsx
- F:\jielingNew/data_execl/base_data\ActivityDropReward.xlsx
- F:\jielingNew/data_execl/base_data\BeStronger.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleReward.xlsx
- F:\jielingNew/data_execl/base_data\ArenaSetting.xlsx
- F:\jielingNew/data_execl/base_data\FakeBattle.xlsx
- F:\jielingNew/data_execl/base_data\FoodsConfig.xlsx
- F:\jielingNew/data_execl/base_data\GameSetting.xlsx
- F:\jielingNew/data_execl/base_data\GlobalActivity.xlsx
- F:\jielingNew/data_execl/base_data\GlobalSystemConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildBossConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildHelpConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildBossRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\AdventureReward.xlsx
- F:\jielingNew/data_execl/base_data\GuildScoreConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSetting.xlsx
- F:\jielingNew/data_execl/base_data\GuildWarConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuideConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildWarRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeMapConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroRankupConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroRankupGroup.xlsx
- F:\jielingNew/data_execl/base_data\DialRewardSetting.xlsx
- F:\jielingNew/data_execl/base_data\CombatControl.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleTask.xlsx
- F:\jielingNew/data_execl/base_data\HeroSacrifice.xlsx
- F:\jielingNew/data_execl/base_data\GuildRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSacrificeRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\JewelConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSacrificeConfig.xlsx
- F:\jielingNew/data_execl/base_data\JumpConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildRedPackConfig.xlsx
- F:\jielingNew/data_execl/base_data\JewelResonanceConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeConfig.xlsx
- F:\jielingNew/data_execl/base_data\LotterySetting.xlsx
- F:\jielingNew/data_execl/base_data\LotterySpecialConfig.xlsx
- F:\jielingNew/data_execl/base_data\LuckyCatConfig.xlsx
- F:\jielingNew/data_execl/base_data\BlessingRewardPool.xlsx
- F:\jielingNew/data_execl/base_data\BuffEffectConfig.xlsx
- F:\jielingNew/data_execl/base_data\BloodyRankConfig.xlsx
- F:\jielingNew/data_execl/base_data\BloodyMessagesConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeMapConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeSetting.xlsx
- F:\jielingNew/data_execl/base_data\LuxuryFund.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeStarBox.xlsx
- F:\jielingNew/data_execl/base_data\MainMapIconConfig.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleTreasure.xlsx
- F:\jielingNew/data_execl/base_data\BloodyBattleSetting.xlsx
- F:\jielingNew/data_execl/base_data\ChampionshipSetting.xlsx
- F:\jielingNew/data_execl/base_data\ChampionshipReward.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeMissionConfig.xlsx
- F:\jielingNew/data_execl/base_data\MazeTreasureSetting.xlsx
- F:\jielingNew/data_execl/base_data\MazeTreasure.xlsx
- F:\jielingNew/data_execl/base_data\MissionEventsConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChampionshipSetting.xlsx
- F:\jielingNew/data_execl/base_data\MonsterViewConfig.xlsx
- F:\jielingNew/data_execl/base_data\ActivityDropReward.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRankingReward.xlsx
- F:\jielingNew/data_execl/base_data\LoginPosterConfig.xlsx
- F:\jielingNew/data_execl/base_data\LevelDifficultyConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipSuiteConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsBoxSeaons.xlsx
- F:\jielingNew/data_execl/base_data\PlayerAppearance.xlsx
- F:\jielingNew/data_execl/base_data\PlayerMountLevelUp.xlsx
- F:\jielingNew/data_execl/base_data\PlayerRole.xlsx
- F:\jielingNew/data_execl/base_data\EquipSignSetting.xlsx
- F:\jielingNew/data_execl/base_data\PrivilegeTypeConfig.xlsx
- F:\jielingNew/data_execl/base_data\PropertyConfig.xlsx
- F:\jielingNew/data_execl/base_data\QAConfig.xlsx
- F:\jielingNew/data_execl/base_data\RaceTowerRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\RaceTowerConfig.xlsx
- F:\jielingNew/data_execl/base_data\EndlessDifficulty.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionNodeConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionFloorConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionSetting.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionHolyConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipStarsConfig.xlsx
- F:\jielingNew/data_execl/base_data\ErrorCodeEerverConfig.xlsx
- F:\jielingNew/data_execl/base_data\RecommendTeam.xlsx
- F:\jielingNew/data_execl/base_data\RunesConfig.xlsx
- F:\jielingNew/data_execl/base_data\RunesPoolConfig.xlsx
- F:\jielingNew/data_execl/base_data\SevenDaysActivity.xlsx
- F:\jielingNew/data_execl/base_data\DialRewardSetting.xlsx
- F:\jielingNew/data_execl/base_data\ExploreFunctionConfig.xlsx
- F:\jielingNew/data_execl/base_data\RoleConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonthcardConfig.xlsx
- F:\jielingNew/data_execl/base_data\SpecialConfig.xlsx
- F:\jielingNew/data_execl/base_data\SystemMessageConfig.xlsx
- F:\jielingNew/data_execl/base_data\DailyChallengeConfig.xlsx
- F:\jielingNew/data_execl/base_data\TestWelfare.xlsx
- F:\jielingNew/data_execl/base_data\TaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\CombatControl.xlsx
- F:\jielingNew/data_execl/base_data\LotteryRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureSunlongConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureSunlongTaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\StoreTypeConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChapterOptionConfig.xlsx
- F:\jielingNew/data_execl/base_data\OptionAddCondition.xlsx
- F:\jielingNew/data_execl/base_data\RandomName.xlsx
- F:\jielingNew/data_execl/base_data\HeroSacrifice.xlsx
- F:\jielingNew/data_execl/base_data\HeroRankupGroup.xlsx
- F:\jielingNew/data_execl/base_data\JewelConfig.xlsx
- F:\jielingNew/data_execl/base_data\ElementalResonanceConfig.xlsx
- F:\jielingNew/data_execl/base_data\PlayerLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\ItemConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipPropertyPool.xlsx
- F:\jielingNew/data_execl/base_data\MainLevelSettingConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopRebuildConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialGameConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopSetting.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopTechnologySetting.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\EndlessMapConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsConfig.xlsx
- F:\jielingNew/data_execl/base_data\ErrorCodeHint.xlsx
- F:\jielingNew/data_execl/base_data\SeverConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipConfig.xlsx
- F:\jielingNew/data_execl/base_data\LevelSetting.xlsx
- F:\jielingNew/data_execl/base_data\JewelResonanceConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsStageConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsBoxPools.xlsx
- F:\jielingNew/data_execl/base_data\RewardItemConfig.xlsx
- F:\jielingNew/data_execl/base_data\JumpConfig.xlsx
- F:\jielingNew/data_execl/base_data\LevelSetting.xlsx
- F:\jielingNew/data_execl/base_data\EndlessDifficulty.xlsx
- F:\jielingNew/data_execl/base_data\LoginPosterConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsBoxSetting.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopFunctionConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopFoundationConfig.xlsx
- F:\jielingNew/data_execl/base_data\VipLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureTaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismanaRankup.xlsx
- F:\jielingNew/data_execl/base_data\LotterySpecialConfig.xlsx
- F:\jielingNew/data_execl/base_data\LuckyCatConfig.xlsx
- F:\jielingNew/data_execl/base_data\LuxuryFund.xlsx
- F:\jielingNew/data_execl/base_data\EndlessMapConfig.xlsx
- F:\jielingNew/data_execl/base_data\MainMapIconConfig.xlsx
- F:\jielingNew/data_execl/base_data\LotterySetting.xlsx
- F:\jielingNew/data_execl/base_data\MazeTreasure.xlsx
- F:\jielingNew/data_execl/base_data\MazeTreasureSetting.xlsx
- F:\jielingNew/data_execl/base_data\HeroRankupConfig.xlsx
- F:\jielingNew/data_execl/base_data\ArenaReward.xlsx
- F:\jielingNew/data_execl/base_data\AccomplishmentConfig.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\RechargeCommodityConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismanaLottery.xlsx
- F:\jielingNew/data_execl/base_data\UIConfig.xlsx
- F:\jielingNew/data_execl/base_data\DialRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChapterEventPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroConfig.xlsx
- F:\jielingNew/data_execl/base_data\AchievementConfig.xlsx
- F:\jielingNew/data_execl/base_data\SevenDaysScore.xlsx
- F:\jielingNew/data_execl/base_data\ArtResourcesConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopEquipmentConfig.xlsx
- F:\jielingNew/data_execl/base_data\SignInConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossSetting.xlsx
- F:\jielingNew/data_execl/base_data\EquipSign.xlsx
- F:\jielingNew/data_execl/base_data\BlessingRewardPool.xlsx
- F:\jielingNew/data_execl/base_data\TrialSetting.xlsx
- F:\jielingNew/data_execl/base_data\ExchangeActivityConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialwelfareConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionRecruitConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialKillConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialQuestionConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossTreasureConfig.xlsx
- F:\jielingNew/data_execl/base_data\DailyTasksConfig.xlsx
- F:\jielingNew/data_execl/base_data\JewelRankupConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroReturn.xlsx
- F:\jielingNew/data_execl/base_data\MapPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\DialogueViewConfig.xlsx
- F:\jielingNew/data_execl/base_data\FloodConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChallengeConfig.xlsx
- F:\jielingNew/data_execl/base_data\MissionEventsConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonthcardConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonsterViewConfig.xlsx
- F:\jielingNew/data_execl/base_data\OptionAddCondition.xlsx
- F:\jielingNew/data_execl/base_data\PlayerAppearance.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismanaLottery.xlsx
- F:\jielingNew/data_execl/base_data\PlayerMountLevelUp.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionNodeConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipPropertyPool.xlsx
- F:\jielingNew/data_execl/base_data\EquipSign.xlsx
- F:\jielingNew/data_execl/base_data\ChapterOptionConfig.xlsx
- F:\jielingNew/data_execl/base_data\ChapterEventPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx
- F:\jielingNew/data_execl/base_data\MainLevelSettingConfig.xlsx
- F:\jielingNew/data_execl/base_data\LotteryRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\PlayerLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\JewelRankupConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipConfig.xlsx
- F:\jielingNew/data_execl/base_data\ItemConfig.xlsx
- F:\jielingNew/data_execl/base_data\ActivityRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\PrivilegeTypeConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipSuiteConfig.xlsx
- F:\jielingNew/data_execl/base_data\ErrorCodeEerverConfig.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismanaRankup.xlsx
- F:\jielingNew/data_execl/base_data\ExchangeActivityConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionSetting.xlsx
- F:\jielingNew/data_execl/base_data\ErrorCodeHint.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionRecruitConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuideConfig.xlsx
- F:\jielingNew/data_execl/base_data\FakeBattle.xlsx
- F:\jielingNew/data_execl/base_data\FoodsConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroReturn.xlsx
- F:\jielingNew/data_execl/base_data\ArtResourcesConfig.xlsx
- F:\jielingNew/data_execl/base_data\SeverConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildScoreConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureSunlongConfig.xlsx
- F:\jielingNew/data_execl/base_data\LevelDifficultyConfig.xlsx
- F:\jielingNew/data_execl/base_data\RunesPoolConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildWarConfig.xlsx
- F:\jielingNew/data_execl/base_data\SevenDaysActivity.xlsx
- F:\jielingNew/data_execl/base_data\TestWelfare.xlsx
- F:\jielingNew/data_execl/base_data\GuildBossRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildHelpConfig.xlsx
- F:\jielingNew/data_execl/base_data\FloodConfig.xlsx
- F:\jielingNew/data_execl/base_data\PropertyConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionHolyConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildRedPackConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSacrificeRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExploreFunctionConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSetting.xlsx
- F:\jielingNew/data_execl/base_data\GuildWarRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\QAConfig.xlsx
- F:\jielingNew/data_execl/base_data\PlayerRole.xlsx
- F:\jielingNew/data_execl/base_data\RaceTowerConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildBossConfig.xlsx
- F:\jielingNew/data_execl/base_data\RunesConfig.xlsx
- F:\jielingNew/data_execl/base_data\RoleConfig.xlsx
- F:\jielingNew/data_execl/base_data\GlobalSystemConfig.xlsx
- F:\jielingNew/data_execl/base_data\RandomName.xlsx
- F:\jielingNew/data_execl/base_data\SystemMessageConfig.xlsx
- F:\jielingNew/data_execl/base_data\TaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialGameConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialKillConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialSetting.xlsx
- F:\jielingNew/data_execl/base_data\TrialQuestionConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossSetting.xlsx
- F:\jielingNew/data_execl/base_data\TrialwelfareConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopFunctionConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopSetting.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopRebuildConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorldBossTreasureConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildSacrificeConfig.xlsx
- F:\jielingNew/data_execl/base_data\GlobalActivity.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopTechnologySetting.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopFoundationConfig.xlsx
- F:\jielingNew/data_execl/base_data\RewardItemConfig.xlsx
- F:\jielingNew/data_execl/base_data\ExpeditionFloorConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopEquipmentConfig.xlsx
- F:\jielingNew/data_execl/base_data\VipLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\GameSetting.xlsx
- F:\jielingNew/data_execl/base_data\EquipSignSetting.xlsx
- F:\jielingNew/data_execl/base_data\SpecialConfig.xlsx
- F:\jielingNew/data_execl/base_data\SignInConfig.xlsx
- F:\jielingNew/data_execl/base_data\SevenDaysScore.xlsx
- F:\jielingNew/data_execl/base_data\EquipStarsConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureSunlongTaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\RecommendTeam.xlsx
- F:\jielingNew/data_execl/base_data\HeroLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\StoreTypeConfig.xlsx
- F:\jielingNew/data_execl/base_data\RechargeCommodityConfig.xlsx
- F:\jielingNew/data_execl/base_data\MapPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\UIConfig.xlsx
- F:\jielingNew/data_execl/base_data\PassiveSkillConfig.xlsx
- F:\jielingNew/data_execl/base_data\SkillConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildTechnology.xlsx
- F:\jielingNew/data_execl/base_data\StoreConfig.xlsx
- F:\jielingNew/data_execl/base_data\TreasureTaskConfig.xlsx
- F:\jielingNew/data_execl/base_data\HeroConfig.xlsx
- F:\jielingNew/data_execl/base_data\RaceTowerRewardConfig.xlsx
- F:\jielingNew/data_execl/base_data\TrialConfig.xlsx
- F:\jielingNew/data_execl/base_data\PassiveSkillLogicConfig.xlsx
- F:\jielingNew/data_execl/base_data\SkillLogicConfig.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopTechnology.xlsx
- F:\jielingNew/data_execl/base_data\SkillConfig.xlsx
- F:\jielingNew/data_execl/base_data\StoreConfig.xlsx
- F:\jielingNew/data_execl/base_data\GuildTechnology.xlsx
- F:\jielingNew/data_execl/base_data\EventPointConfig.xlsx
- F:\jielingNew/data_execl/base_data\RewardGroup.xlsx
- F:\jielingNew/data_execl/base_data\OptionConfig.xlsx
- F:\jielingNew/data_execl/base_data\RewardGroup.xlsx
- F:\jielingNew/data_execl/base_data\WorkShopTechnology.xlsx
- F:\jielingNew/data_execl/base_data\SkillLogicConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonsterGroup.xlsx
- F:\jielingNew/data_execl/base_data\EquipTalismana.xlsx
- F:\jielingNew/data_execl/base_data\MainLevelConfig.xlsx
- F:\jielingNew/data_execl/base_data\MonsterConfig.xlsx
_values:
- 309514008
- 1300967772
- 230994945
- 755222564
- 2050621784
- 3102098770
- 4055477448
- 3507522218
- 3548626589
- 2605131572
- 413963702
- 1048362391
- 353142748
- 1848421159
- 613479935
- 413963702
- 3252026258
- 2296996310
- 109990768
- 3755728772
- 3798417120
- 1169654203
- 903221398
- 1774803500
- 755222564
- 3102098770
- 309514008
- 3591751192
- 984518206
- 230994945
- 1924824445
- 1510460150
- 3226994303
- 636689279
- 911577538
- 2241788502
- 173728414
- 3894020600
- 3153364400
- 3943131728
- 613479935
- 3079207713
- 3472737567
- 3585263874
- 1218957739
- 2445182985
- 2031449552
- 3754433465
- 1493914227
- 4198004043
- 564908116
- 2131302457
- 911337247
- 1442255327
- 1468913191
- 727009153
- 1996735664
- 2264269610
- 475620184
- 3597116301
- 2759035733
- 425543864
- 3682513624
- 2479323017
- 732833747
- 2605131572
- 3548626589
- 4055477448
- 2031449552
- 1705732776
- 2903827109
- 1565259591
- 2043460280
- 3507522218
- 2050621784
- 3338153430
- 4243693008
- 1572157444
- 3746847302
- 2048030774
- 3625815197
- 368579360
- 515856748
- 3591751192
- 1048362391
- 3449935329
- 295715991
- 4124958540
- 249002466
- 2534897219
- 319164499
- 3641128642
- 3517900411
- 277486271
- 2867634862
- 1511816098
- 2842862470
- 4177681514
- 1240442055
- 1180842953
- 3621447502
- 3674283409
- 593418072
- 494399256
- 527608228
- 933632842
- 1155516420
- 804383039
- 160427834
- 4198004043
- 1382260277
- 1924994647
- 1786980484
- 3342605112
- 297530923
- 1774803500
- 4291486445
- 3951547032
- 564908116
- 1445024159
- 1115488926
- 898095515
- 215828471
- 3033812632
- 683415129
- 38983593
- 911337247
- 1493914227
- 727009153
- 583891024
- 3561388971
- 2307322054
- 3153107712
- 1393544882
- 2777840995
- 1982645928
- 3663717884
- 3048495520
- 2606088806
- 967064327
- 3347320787
- 460607005
- 1448464981
- 2748321716
- 2405263382
- 3705022903
- 3597116301
- 1402356663
- 903221398
- 15839083
- 2264269610
- 3705022903
- 1240442055
- 1095169528
- 932779961
- 2405621183
- 98336120
- 241982493
- 1513554725
- 2294226303
- 3682513624
- 2479323017
- 2903827109
- 3347320787
- 2043460280
- 425543864
- 2048030774
- 3746847302
- 3040822371
- 2296996310
- 427098595
- 294734179
- 3030144971
- 2568046174
- 3380638355
- 109990768
- 3442665542
- 3014861588
- 353142748
- 1952787401
- 571396712
- 110435588
- 3911391710
- 811712663
- 1790592577
- 732833747
- 2769353865
- 243491956
- 2854113790
- 1023901955
- 739739032
- 2656593449
- 625696080
- 3755728772
- 980629513
- 3509406354
- 3255901169
- 3935903312
- 1162865092
- 1791256076
- 3089114090
- 2759035733
- 3625815197
- 1786980484
- 515856748
- 683415129
- 2534897219
- 2568046174
- 319164499
- 1180842953
- 3153107712
- 1790592577
- 3033812632
- 3442665542
- 568553271
- 1393544882
- 1445024159
- 3561388971
- 980629513
- 2405263382
- 2307322054
- 3905567963
- 277486271
- 4124958540
- 527608228
- 2294226303
- 243491956
- 3674283409
- 1448464981
- 1023901955
- 1218957739
- 1510460150
- 3226994303
- 3935903312
- 571396712
- 2748321716
- 3079207713
- 1115488926
- 295715991
- 804383039
- 3585263874
- 160427834
- 4291486445
- 3943131728
- 3894020600
- 3089114090
- 2867634862
- 102401832
- 3153364400
- 1442255327
- 475620184
- 1468913191
- 1382260277
- 3472737567
- 2445182985
- 1718208583
- 3641128642
- 4177681514
- 173728414
- 1155516420
- 1924994647
- 3879379094
- 38983593
- 297530923
- 3951547032
- 1982645928
- 739739032
- 2769353865
- 2656593449
- 811712663
- 2854113790
- 2606088806
- 2405621183
- 967064327
- 3663717884
- 2777840995
- 625696080
- 1996735664
- 3406497307
- 3048495520
- 98336120
- 15839083
- 3621447502
- 110435588
- 241982493
- 636689279
- 3517900411
- 3997302156
- 3911391710
- 1952787401
- 494399256
- 898095515
- 933632842
- 3255901169
- 1380380783
- 1427646335
- 1162865092
- 2532109620
- 98570907
- 2162791513
- 312894044
- 2884272101
- 1513554725
- 3014861588
- 2842862470
- 3509406354
- 491951589
- 3036639695
- 2453679101
- 2162791513
- 2884272101
- 312894044
- 2343409024
- 390613341
- 1704981563
- 390613341
- 2453679101
- 3036639695
- 2594442567
- 2362342209
- 1397243523

Binary file not shown.