diff --git a/AssetBundles/version.txt b/AssetBundles/version.txt index 2e38462b5f..103a7b9870 100644 --- a/AssetBundles/version.txt +++ b/AssetBundles/version.txt @@ -1 +1 @@ -{"subChannel":"200417", "channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.3", "version":"0.16.0", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file +{"channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.3", "subChannel":"200417", "version":"0.16.0", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/Assets/CRC/game.asset b/Assets/CRC/game.asset index 52b2d4bb60..d3d85c15be 100644 --- a/Assets/CRC/game.asset +++ b/Assets/CRC/game.asset @@ -5063,8 +5063,8 @@ MonoBehaviour: size: 26774 - id: 1263 fileName: lz4/prefabs/ui/guide.unity3d - crc: 614991858 - size: 95689 + crc: 3811385329 + size: 95683 - id: 1264 fileName: lz4/prefabs/ui/guild.unity3d crc: 2941261915 @@ -5931,8 +5931,8 @@ MonoBehaviour: size: 1116 - id: 1480 fileName: lzma/luabytes.unity3d - crc: 2351771138 - size: 1998611 + crc: 1454474345 + size: 1998246 - id: 1481 fileName: lzma/resconfigs.unity3d crc: 3759467906 diff --git a/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat b/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat index f1bfe9fc3b..b7d1a36e69 100644 --- a/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat +++ b/Assets/ManagedResources/Effects/Materials/GuidePanelMat.mat @@ -76,8 +76,8 @@ Material: - _SrcBlend: 1 - _Trans: 10 - _UVSec: 0 - - _X: 0.2638889 - - _Y: 0.11140624 + - _X: 0.5 + - _Y: 0.5 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ManagedResources/~Lua/Config/Data/HeroConfig.lua b/Assets/ManagedResources/~Lua/Config/Data/HeroConfig.lua index 348e11398f..9dd3cfa78d 100644 --- a/Assets/ManagedResources/~Lua/Config/Data/HeroConfig.lua +++ b/Assets/ManagedResources/~Lua/Config/Data/HeroConfig.lua @@ -124,7 +124,7 @@ __refs = { nil, {1586,1.81,-175,176,1.7,-171,-12,184,1.4,-176,-12,189,1.8,-215,.9,216,1.2,-187,-5,193,1.3,-196,197,1.2,-199,200,-195,-31,.11,227,1.2,-211,212,1}, {1643,1.54,-277,.73,278,1.5}, - {{{1},{18,-11,0,11,-8,-3,5,-5,1,8,-9,5,11,-14,3,6,0,-11,16,-13,9,-7,0,9,-15,15,-15,.5,2,-2,.5,14,-6,7,-13,-2,.04,3,5,4,-3,-7,17}},{{2},{19,-8,8,-11,3,-2,-1,9,2,-8,14,-10,-2,11,-1,-8,0,8,-2,-12},{1.2,-2.3,1,2,1,4,2,1,3,1.2,2,7,8,1.2,46}},{{3},{9,6,-1,-3,3,6},{6,2,1,2,12,66}}}, + {{{1},{18,-11,0,12,-9,-3,5,-5,11,-2,-9,5,11,-5,-6,6,0,-11,16,-13,9,-7,0,9,-15,15,-15,.5,8,-8,.5,14,1,.2,-15,.04,3,5,4,3,-8,12}},{{2},{19,-8,-3,8,-5,8,-11,9,2,0,-9,15,-10,-2,10,0,-8,8,0,-12,11,-8},{1.2,4,1.3,2,1,-2.3,1,3,1.2,2,7,8,1,43,3,1}},{{3},{9,11,-11,11,-9,5,-2,2,8,1,-9},{6,3,2,3,-4.2,1,10,8,1,47}}}, {7,.32,-1,1,-1,.5,3.1,1,.3,-1,.04,1,.5} }, __refPoss = { diff --git a/Assets/ManagedResources/~Lua/Config/Data/RecommendTeam.lua b/Assets/ManagedResources/~Lua/Config/Data/RecommendTeam.lua index 38a600078a..6531f9d9ec 100644 --- a/Assets/ManagedResources/~Lua/Config/Data/RecommendTeam.lua +++ b/Assets/ManagedResources/~Lua/Config/Data/RecommendTeam.lua @@ -2,7 +2,7 @@ local RecommendTeam = { __count = 19, __indexs = {1.91}, __values = {1.6,9995,1.32,2,-7.2,1.3,42,1.5}, -__exVals = {49,'输出国家队','控制国家队','无限眩晕流','极限雷震流','水系混搭队','风系国家队','极限悟空流','风系混搭队','极限飞虎流','火系混搭队','地系混搭队','流派特色:以雷震子为核心对敌人造成巨额伤害,洛神协助输出,猪八戒作为肉盾抵挡伤害,嫦娥、共工和精卫为全队提供治疗、无敌盾、光环和回怒等辅助,实现续航永动。','流派特色:五保一,其余五人提供各种辅助,以雷震子为核心造成毁水灭风的输出。','流派特色:各阵营输出辅助混搭,伤害最大化,快速结束战斗','流派特色:以雷震子为输出核心配合其他拥有控制技能的角色,达到持续输出','流派特色:雷震子核心爆炸输出,敖丙、洛神收割追击,配合嫦娥、精卫和共工辅助保命,快速结束战斗','流派特色:以孙悟空为核心输出,地飞虎辅助输出,配合其他角色辅助治疗控制,平稳输出','流派特色:以孙悟空为核心,其他角色辅助配合,孙悟空爆炸输出无限收割','流派特色:金翅大鹏承伤复活,孙悟空、百眼魔君输出配合辅助治疗增益,平稳输出','流派特色:女娲、申公豹控住,百眼魔君核心输出,织女、精卫、共工回怒辅助,达到永动无限控制','流派特色:李靖肉盾减伤,孙悟空核心输出,其余角色治疗辅助,控制消耗','流派特色:以地飞虎为绝对核心,其他角色辅助增益,单点击杀无限收割','流派特色:以骊山山老母为核心配合九命猫和伏羲输出,蚩尤肉盾抗伤东皇太一和火德星君辅助治疗,能力综合平稳输出','流派特色:以哪吒为核心,配合铁扇公主全体眩晕,其余角色抗伤辅助,强力控场平稳输出','流派特色:哪吒放火灼烧,东华帝君秒杀收割,其余角色辅助增益,暴力秒杀','流派特色:以百眼魔君为核心输出,配合玉面公主等控制增益,稳定输出','流派特色:以百眼魔君为核心输出,配合申公豹和女娲控制,共工和精卫和织女辅助,稳定控制持续输出','流派特色:以杨戬为主要输出,配合其他角色抗伤辅助,持续稳定输出','流派特色:配合混搭增益控制,百眼魔君为主输出,平稳输出','流派特色:百眼魔君、杨戬为主要输出,配合阎罗王伤害传导,巨灵神抗伤,玉面公主和姜子牙辅助治疗,快速结束战斗','1位:洛神,后排输出,追加普攻,伤害叠加;#2位:猪八戒,肉盾反伤,吸血;#3位:嫦娥,治疗,受伤治疗;#4位:雷震子,核心输出,追加技能;#5位:共工,无敌盾,攻击光环,回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:雷震子,阵容核心,输出毁水灭风;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,攻击光环,回怒,无敌盾;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:哪吒,灼烧敌人,封无敌;#2位:雷震子,群体爆发输出;#3位:敖丙,爆发,收割,追击;#4位:东皇太一,无敌盾,回怒,攻击光环;#5位:妲己,攻击光环,回怒;#6位:共工,攻击光环,无敌盾,回怒.','1位:文曲星,前排沉默,技能无消耗;#2位:九水火女,纵排眩晕,纵排减怒;#3位:嫦娥,治疗,受伤治疗;#4位:雷震子,输出核心,追加技能;#5位:共工,无敌盾,攻击光环,回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:雷震子,核心输出,追加技能;#2位:洛神,后排输出,追加普攻,增伤叠加;#3位:敖丙,爆发,收割,追击;#4位:精卫,回怒,暴击光环,技能无消耗;#5位:共工,无敌盾,攻击光环,回怒;#6位:嫦娥,治疗,受伤治疗.','1位:孙悟空,纵排输出,增伤叠加追加普攻;#2位:女娲,后排眩晕,减怒,追加技能;#3位:唐僧,全体治疗,受伤治疗;#4位:地飞虎,前排输出,增伤叠加,追加普攻;#5位:地水化,单点收割,高爆发,击杀后必暴击;#6位:妲己,攻击光环,后排回怒.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:孙悟空,阵容绝对核心,爆炸输出,无限收割;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,无敌盾,攻击光环,回怒;#5位:妲己,攻击光环,后排回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:百眼魔君,中毒,封治疗,无视防御的伤害;#2位:金翅大鹏,承伤反击,暴力输出;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:孙悟空,纵排输出,增伤叠加追加普攻;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,核心输出,中毒,封治疗,无视防御的伤害;#3位:女娲,后排眩晕,减怒,追加技能;#4位:共工,无敌盾,攻击光环,回怒;#5位:精卫,回怒,暴击光环,技能无消耗;#6位:织女,减伤光环,回怒,治疗队友.','1位:李靖,肉盾,前排减伤;#2位:女娲,后排眩晕,减怒,追加技能;#3位:唐僧,全体治疗,受伤治疗;#4位:孙悟空,纵排输出,增伤叠加追加普攻;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:地飞虎,前排输出,增伤叠加,追加普攻;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,无敌盾,攻击光环,回怒;#5位:妲己,攻击光环,后排回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:祝融,阵容核心,后排纵火;#3位:蚩尤,肉盾,高额减伤,无敌盾;#4位:伏羲,后排输出,高爆发,追加普攻;#5位:火德星君,全体治疗,持续治疗;#6位:九命猫,单点收割,高爆发.','1位:哪吒,阵容核心,纵火灼烧;#2位:蚩尤,肉盾,高额减伤,无敌盾;#3位:铁扇公主,全体眩晕,死亡追加技能;#4位:东皇太一,无敌盾,攻击光环,回怒;#5位:伏羲,后排输出,高爆发,追加普攻;#6位:火德星君,全体治疗,持续治疗.','1位:哪吒,阵容核心,纵火灼烧;#2位:东华帝君,收割,斩杀;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:妲己,攻击光环,后排回怒;#5位:织女,减伤光环,回怒,治疗队友;#6位:共工,无敌盾,攻击光环,回怒.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:杨戬,主要输出,全体减怒,增伤叠加;#4位:玉面公主,单体减怒,回怒;#5位:燃灯,攻击光环,单体回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:女娲,后排眩晕,减怒,追加技能;#4位:共工,无敌盾,攻击光环,回怒;#5位:精卫,回怒,暴击光环,技能无消耗;#6位:织女,减伤光环,回怒,治疗队友.','1位:吕洞宾,全体麻痹,全体减怒;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:巨灵神,肉盾,受伤减怒;#4位:杨戬,主要输出,全体减怒,增伤叠加;#5位:玉面公主,单体减怒,回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.','1位:哪吒,纵火灼烧,封无敌;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:姜子牙,全体治疗,复活,死亡追加技能;#5位:妲己,攻击光环,后排回怒;#6位:织女,减伤光环,回怒,治疗队友.','1位:阎罗王,链接符,伤害传导;#2位:百眼魔君,核心输出,中毒,封治疗,无视防御的伤害;#3位:杨戬,主要输出,全体减怒,伤害叠加;#4位:巨灵神,肉盾,受伤减怒;#5位:玉面公主,单体减怒,回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.'}, +__exVals = {56,'无限眩晕流','永动输出队','极限雷震流','水系混搭队','永动控制队','水系国家队','暴力输出队','极限悟空流','风系混搭队','暴力控制队','极限飞虎流','灼烧输出队','灼烧控制队','火系混搭队','减怒控制队','减怒输出队','地系混搭队','输出国家队','流派特色:水属性神将可以通过技能效果快速的回复怒气,从而实现技能的连续释放。通过治疗减伤和肉盾的配合,保障输出生存。\n阵容思路:以雷震子为核心对敌人造成巨额伤害,洛神协助输出,猪八戒作为肉盾抵挡伤害,嫦娥、共工和精卫为全队提供治疗、无敌盾、光环和回怒等辅助,实现续航永动。','流派特色:五保一,其余五人提供各种辅助,以雷震子为核心造成毁水灭风的输出。','流派特色:各阵营输出辅助混搭,伤害最大化,快速结束战斗','流派特色:水属性神将快速回复怒气的特性,可以保证对进行持续的控制。从而给输出提供足够的输出空间。\n阵容思路:以雷震子为输出核心配合其他拥有控制技能的角色,达到持续输出','流派特色:雷震子核心爆炸输出,敖丙、洛神收割追击,配合嫦娥、精卫和共工辅助保命,快速结束战斗','流派特色:风属性神将拥有极高的输出能力,通过暴力的输出来快速解决敌人。通过输出之间的配合来加强输出能力。\n阵容思路:以孙悟空为核心输出,黄飞虎辅助输出,配合其他角色辅助治疗控制,平稳输出','流派特色:以孙悟空为核心,其他角色辅助配合,孙悟空爆炸输出无限收割','流派特色:金翅大鹏承伤复活,孙悟空、百眼魔君输出配合辅助治疗增益,平稳输出','流派特色:女娲、申公豹控住,百眼魔君核心输出,织女、精卫、共工回怒辅助,达到永动无限控制','流派特色:风属性神将的输出能力,搭配其他治疗控制等,来最大化的保障输出的生存和输出空间。\n阵容思路:李靖肉盾减伤,孙悟空核心输出,其余角色治疗辅助,控制消耗','流派特色:以地飞虎为绝对核心,其他角色辅助增益,单点击杀无限收割','流派特色:火属性神将具有强大的灼烧能力,并且对处于灼烧状态的敌人有大量输出加成。围绕灼烧武将的能力进行搭配,利用灼烧后的巨量伤害加成,最大化发挥灼烧队伍的优势。\n阵容思路:祝融为核心配合九命猫和伏羲输出,蚩尤肉盾抗伤东皇太一和火德星君辅助治疗,能力综合平稳输出','流派特色:火属性神将对处于灼烧状态敌人有大量控制加成。围绕灼烧武将的能力进行搭配,最大化增强对于敌人的控制能力,保证平稳输出。\n阵容思路:以哪吒为核心,配合铁扇公主全体眩晕,其余角色抗伤辅助,强力控场平稳输出','流派特色:哪吒放火灼烧,东华帝君秒杀收割,其余角色辅助增益,暴力秒杀','流派特色:地属性神将的减怒效果搭配多种控制效果,使敌人无法反击,极大削弱敌方输出。\n阵容思路:以百眼魔君为核心输出,配合玉面公主等控制增益,稳定输出','流派特色:以百眼魔君为核心输出,配合申公豹和女娲控制,共工和精卫和织女辅助,稳定控制持续输出','流派特色:地属性神将可以通过技能来减少敌人怒气,使敌人无法释放技能,从而建立优势。\n阵容思路:以东华帝君为主要输出,配合其他角色抗伤辅助,持续稳定输出','流派特色:配合混搭增益控制,百眼魔君为主输出,平稳输出','流派特色:百眼魔君、杨戬为主要输出,配合阎罗王伤害传导,巨灵神抗伤,玉面公主和姜子牙辅助治疗,快速结束战斗','1位:洛神,后排输出,追加普攻,伤害叠加;#2位:猪八戒,肉盾反伤,吸血;#3位:嫦娥,治疗,受伤治疗;#4位:雷震子,核心输出,追加技能;#5位:共工,无敌盾,攻击光环,回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:雷震子,阵容核心,输出毁水灭风;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,攻击光环,回怒,无敌盾;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:哪吒,灼烧敌人,封无敌;#2位:雷震子,群体爆发输出;#3位:敖丙,爆发,收割,追击;#4位:东皇太一,无敌盾,回怒,攻击光环;#5位:妲己,攻击光环,回怒;#6位:共工,攻击光环,无敌盾,回怒.','1位:文曲星,前排沉默,技能无消耗;#2位:九天玄女,纵排眩晕,纵排减怒;#3位:嫦娥,治疗,受伤治疗;#4位:雷震子,输出核心,追加技能;#5位:共工,无敌盾,攻击光环,回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:雷震子,核心输出,追加技能;#2位:洛神,后排输出,追加普攻,增伤叠加;#3位:敖丙,爆发,收割,追击;#4位:精卫,回怒,暴击光环,技能无消耗;#5位:共工,无敌盾,攻击光环,回怒;#6位:嫦娥,治疗,受伤治疗.','1位:孙悟空,纵排输出,增伤叠加追加普攻;#2位:女娲,后排眩晕,减怒,追加技能;#3位:唐僧,全体治疗,受伤治疗;#4位:黄飞虎,前排输出,增伤叠加,追加普攻;#5位:黄天化,单点收割,高爆发,击杀后必暴击;#6位:妲己,攻击光环,后排回怒.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:孙悟空,阵容绝对核心,爆炸输出,无限收割;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,无敌盾,攻击光环,回怒;#5位:妲己,攻击光环,后排回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:百眼魔君,中毒,封治疗,无视防御的伤害;#2位:金翅大鹏,承伤反击,暴力输出;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:孙悟空,纵排输出,增伤叠加追加普攻;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,核心输出,中毒,封治疗,无视防御的伤害;#3位:女娲,后排眩晕,减怒,追加技能;#4位:共工,无敌盾,攻击光环,回怒;#5位:精卫,回怒,暴击光环,技能无消耗;#6位:织女,减伤光环,回怒,治疗队友.','1位:李靖,肉盾,前排减伤;#2位:女娲,后排眩晕,减怒,追加技能;#3位:唐僧,全体治疗,受伤治疗;#4位:孙悟空,纵排输出,增伤叠加追加普攻;#5位:织女,减伤光环,回怒,治疗队友;#6位:妲己,攻击光环,后排回怒.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:地飞虎,前排输出,增伤叠加,追加普攻;#3位:燃灯,攻击光环,单体减怒,单体回怒;#4位:共工,无敌盾,攻击光环,回怒;#5位:妲己,攻击光环,后排回怒;#6位:精卫,回怒,暴击光环,技能无消耗.','1位:东皇太一,无敌盾,攻击光环,回怒;#2位:祝融,阵容核心,后排纵火;#3位:蚩尤,肉盾,高额减伤,无敌盾;#4位:伏羲,后排输出,高爆发,追加普攻;#5位:火德星君,全体治疗,持续治疗;#6位:九命猫,单点收割,高爆发.','1位:哪吒,阵容核心,纵火灼烧;#2位:蚩尤,肉盾,高额减伤,无敌盾;#3位:铁扇公主,全体眩晕,死亡追加技能;#4位:东皇太一,无敌盾,攻击光环,回怒;#5位:伏羲,后排输出,高爆发,追加普攻;#6位:火德星君,全体治疗,持续治疗.','1位:哪吒,阵容核心,纵火灼烧;#2位:东华帝君,收割,斩杀;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:妲己,攻击光环,后排回怒;#5位:织女,减伤光环,回怒,治疗队友;#6位:共工,无敌盾,攻击光环,回怒.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:东华帝君,主要输出,全体减怒,增伤叠加;#4位:玉面公主,单体减怒,回怒;#5位:燃灯,攻击光环,单体回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.','1位:申公豹,前排眩晕,前排减怒;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:女娲,后排眩晕,减怒,追加技能;#4位:共工,无敌盾,攻击光环,回怒;#5位:精卫,回怒,暴击光环,技能无消耗;#6位:织女,减伤光环,回怒,治疗队友.','1位:吕洞宾,全体麻痹,全体减怒;#2位:白眼魔君,中毒,封治疗,无视防御的伤害;#3位:巨灵神,肉盾,受伤减怒;#4位:东华帝君,主要输出,全体减怒,增伤叠加;#5位:玉面公主,单体减怒,回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.','1位:哪吒,纵火灼烧,封无敌;#2位:百眼魔君,中毒,封治疗,无视防御的伤害;#3位:东皇太一,无敌盾,攻击光环,回怒;#4位:姜子牙,全体治疗,复活,死亡追加技能;#5位:妲己,攻击光环,后排回怒;#6位:织女,减伤光环,回怒,治疗队友.','1位:阎罗王,链接符,伤害传导;#2位:百眼魔君,核心输出,中毒,封治疗,无视防御的伤害;#3位:杨戬,主要输出,全体减怒,伤害叠加;#4位:巨灵神,肉盾,受伤减怒;#5位:玉面公主,单体减怒,回怒;#6位:姜子牙,全体治疗,复活,死亡追加技能.'}, __fields = { 'Id', 'Type', @@ -25,10 +25,10 @@ __defaults = { __refs = { {1,.4,1,.5,1,.2,6.2}, {1.5,-4,1.5,-5,1.2,-2,1.4}, - {43,3,1,-3,4,-5,6,1,-5,-1,7,-8,1,8,3.2,-2,10,-10}, - {54,1.81}, + {44,1.7,-8,9,1.5,-14,15,1.2}, + {61,1.81}, {{{1},{8,7,5,-9,6,12,-14,19,6,-24,-1,0,5,0,20,0,-21,1,22}},{{2},{9,8,0,9,-18,20,1,9,-4,-6,-10,21,-17,11,1,.4}},{{3},{24,12,1,-13,13,-24,23,-21,13,-15,23,-14,5,-12,16,-3,-3,-10,16}},{{4},{17,-5,3,2,-3,4,-6,17,-17,2.1,-5,8,26,-6,-23,19,-1,-5}},{{5},{12,20,9,-29,0,9,20,-9,-18,18,9,-31,-3,25,4,-22,21,6,-6}},{{6},{14,27,-29,2,10,17,-27,27,-9,9,-27,9,-13,2,18,2,-2,2.1}}}, - {73,1.81}, + {80,1.81}, nil }, __refPoss = { diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua index 28344f32ba..92f1de0769 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua @@ -41,9 +41,12 @@ function this.GetSevenDayCarnivalRedPoint() redPoint = redPoint or this.GetBoxRedPointStatus() end if not redPoint then - for i = 1, SevenDayCarnivalManager.GetCurrentDayNumber() do - if this.GetSevenDayCarnivalRedPoint2(i) then - redPoint = true + local curDayIndex = SevenDayCarnivalManager.GetCurrentDayNumber() + if curDayIndex and curDayIndex > 0 then + for i = 1, curDayIndex do + if this.GetSevenDayCarnivalRedPoint2(i) then + redPoint = true + end end end end @@ -120,8 +123,8 @@ function this.GetPriorityDayNumber() break end end - if not dayIndex then - local currentDay = this.GetCurrentDayNumber() + local currentDay = this.GetCurrentDayNumber() + if not dayIndex or dayIndex > currentDay then if currentDay >= kMaxDay then dayIndex = kMaxDay else @@ -151,6 +154,9 @@ function this.GetDayNumberRedPointStatus(dayNumber) end end redPoint = redPoint or this.GetSevenDayHalfPriceRedPoint(dayNumber) + if this.GetSevenDayCarnivalRedPoint2(dayNumber) then + redPoint = true + end return redPoint end diff --git a/Assets/Resources/version.txt b/Assets/Resources/version.txt index 2e38462b5f..103a7b9870 100644 --- a/Assets/Resources/version.txt +++ b/Assets/Resources/version.txt @@ -1 +1 @@ -{"subChannel":"200417", "channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.3", "version":"0.16.0", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file +{"channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.3", "subChannel":"200417", "version":"0.16.0", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 7249091487..64a88f5501 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,336 +13,336 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - E:\Git\JL/data_execl/base_data\ActivityRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\DailyChallengeConfig.xlsx - - E:\Git\JL/data_execl/base_data\ChapterEventPointConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExpeditionNodeConfig.xlsx - - E:\Git\JL/data_execl/base_data\DailyTasksConfig.xlsx - - E:\Git\JL/data_execl/base_data\CombatControl.xlsx - - E:\Git\JL/data_execl/base_data\EquipStarsConfig.xlsx - - E:\Git\JL/data_execl/base_data\DialogueViewConfig.xlsx - - E:\Git\JL/data_execl/base_data\ErrorCodeHint.xlsx - - E:\Git\JL/data_execl/base_data\ExpeditionRecruitConfig.xlsx - - E:\Git\JL/data_execl/base_data\ErrorCodeEerverConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExpeditionHolyConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExpeditionSetting.xlsx - - E:\Git\JL/data_execl/base_data\EquipConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExpeditionFloorConfig.xlsx - - E:\Git\JL/data_execl/base_data\GameSetting.xlsx - - E:\Git\JL/data_execl/base_data\LoginPosterConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipTalismana.xlsx - - E:\Git\JL/data_execl/base_data\ItemConfig.xlsx - - E:\Git\JL/data_execl/base_data\BuffEffectConfig.xlsx - - E:\Git\JL/data_execl/base_data\LanguageText.csv - - E:\Git\JL/data_execl/base_data\GuildSacrificeRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\ArtResourcesConfig.xlsx - - E:\Git\JL/data_execl/base_data\AdventureConfig.xlsx - - E:\Git\JL/data_execl/base_data\LotterySpecialConfig.xlsx - - E:\Git\JL/data_execl/base_data\LotteryRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\LuxuryFund.xlsx - - E:\Git\JL/data_execl/base_data\LotterySetting.xlsx - - E:\Git\JL/data_execl/base_data\ChampionshipSetting.xlsx - - E:\Git\JL/data_execl/base_data\ChampionshipReward.xlsx - - E:\Git\JL/data_execl/base_data\ActivityDropReward.xlsx - - E:\Git\JL/data_execl/base_data\MainLevelConfig.xlsx - - E:\Git\JL/data_execl/base_data\ChallengeMissionConfig.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsBoxPools.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsBoxSetting.xlsx - - E:\Git\JL/data_execl/base_data\DialRewardSetting.xlsx - - E:\Git\JL/data_execl/base_data\MonsterGroup.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsBoxSeaons.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsStageConfig.xlsx - - E:\Git\JL/data_execl/base_data\AchievementConfig.xlsx - - E:\Git\JL/data_execl/base_data\AdventureReward.xlsx - - E:\Git\JL/data_execl/base_data\PassiveSkillLogicConfig.xlsx - - E:\Git\JL/data_execl/base_data\AccomplishmentConfig.xlsx - - E:\Git\JL/data_execl/base_data\MonsterConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipSignSetting.xlsx - - E:\Git\JL/data_execl/base_data\EquipTalismanaLottery.xlsx - - E:\Git\JL/data_execl/base_data\PrivilegeTypeConfig.xlsx - - E:\Git\JL/data_execl/base_data\PropertyConfig.xlsx - - E:\Git\JL/data_execl/base_data\QAConfig.xlsx - - E:\Git\JL/data_execl/base_data\AreaConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipSuiteConfig.xlsx - - E:\Git\JL/data_execl/base_data\ActivityRankingReward.xlsx - - E:\Git\JL/data_execl/base_data\ChallengeStarBox.xlsx - - E:\Git\JL/data_execl/base_data\RewardGroup.xlsx - - E:\Git\JL/data_execl/base_data\RoleConfig.xlsx - - E:\Git\JL/data_execl/base_data\DialRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildScoreConfig.xlsx - - E:\Git\JL/data_execl/base_data\RewardItemConfig.xlsx - - E:\Git\JL/data_execl/base_data\ChapterOptionConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildHelpConfig.xlsx - - E:\Git\JL/data_execl/base_data\EndlessDifficulty.xlsx - - E:\Git\JL/data_execl/base_data\SkillConfig.xlsx - - E:\Git\JL/data_execl/base_data\SkillLogicConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipPropertyPool.xlsx - - E:\Git\JL/data_execl/base_data\StoreConfig.xlsx - - E:\Git\JL/data_execl/base_data\StoreTypeConfig.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx - - E:\Git\JL/data_execl/base_data\EndlessMapConfig.xlsx - - E:\Git\JL/data_execl/base_data\TaskConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExchangeActivityConfig.xlsx - - E:\Git\JL/data_execl/base_data\FloodConfig.xlsx - - E:\Git\JL/data_execl/base_data\TreasureTaskConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipSign.xlsx - - E:\Git\JL/data_execl/base_data\DifferDemonsConfig.xlsx - - E:\Git\JL/data_execl/base_data\UIConfig.xlsx - - E:\Git\JL/data_execl/base_data\VipLevelConfig.xlsx - - E:\Git\JL/data_execl/base_data\EventPointConfig.xlsx - - E:\Git\JL/data_execl/base_data\HeroLevelConfig.xlsx - - E:\Git\JL/data_execl/base_data\HeroRankupConfig.xlsx - - E:\Git\JL/data_execl/base_data\ExploreFunctionConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildRedPackConfig.xlsx - - E:\Git\JL/data_execl/base_data\EquipTalismanaRankup.xlsx - - E:\Git\JL/data_execl/base_data\FoodsConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorldBossConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorldBossRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildBossRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\JewelRankupConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildSetting.xlsx - - E:\Git\JL/data_execl/base_data\JumpConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildWarConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildLevelConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildWarRewardConfig.xlsx - - E:\Git\JL/data_execl/base_data\ChallengeSetting.xlsx - - E:\Git\JL/data_execl/base_data\LevelDifficultyConfig.xlsx - - E:\Git\JL/data_execl/base_data\HeroRankupGroup.xlsx - - E:\Git\JL/data_execl/base_data\GuildTechnology.xlsx - - E:\Git\JL/data_execl/base_data\JewelResonanceConfig.xlsx - - E:\Git\JL/data_execl/base_data\HeroReturn.xlsx - - E:\Git\JL/data_execl/base_data\ArenaSetting.xlsx - - E:\Git\JL/data_execl/base_data\LevelSetting.xlsx - - E:\Git\JL/data_execl/base_data\RechargeCommodityConfig.xlsx - - E:\Git\JL/data_execl/base_data\ElementalResonanceConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildSacrificeConfig.xlsx - - E:\Git\JL/data_execl/base_data\SpecialConfig.xlsx - - E:\Git\JL/data_execl/base_data\PlayerRole.xlsx + - E:\Git\JL/data_execl/base_data\BloodyMessagesConfig.xlsx - E:\Git\JL/data_execl/base_data\ArenaRobotSetting.xlsx + - E:\Git\JL/data_execl/base_data\ElementalResonanceConfig.xlsx + - E:\Git\JL/data_execl/base_data\DifferDemonsBoxPools.xlsx + - E:\Git\JL/data_execl/base_data\ArenaRobotConfig.xlsx + - E:\Git\JL/data_execl/base_data\EndlessDifficulty.xlsx + - E:\Git\JL/data_execl/base_data\DifferDemonsBoxSeaons.xlsx + - E:\Git\JL/data_execl/base_data\ErrorCodeEerverConfig.xlsx + - E:\Git\JL/data_execl/base_data\GlobalActivity.xlsx + - E:\Git\JL/data_execl/base_data\ExpeditionRecruitConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildSacrificeRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildScoreConfig.xlsx + - E:\Git\JL/data_execl/base_data\ExploreFunctionConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipSign.xlsx + - E:\Git\JL/data_execl/base_data\BloodyBattleTreasure.xlsx + - E:\Git\JL/data_execl/base_data\ChallengeMapConfig.xlsx + - E:\Git\JL/data_execl/base_data\ChampionshipReward.xlsx + - E:\Git\JL/data_execl/base_data\EquipStarsConfig.xlsx + - E:\Git\JL/data_execl/base_data\ErrorCodeHint.xlsx + - E:\Git\JL/data_execl/base_data\FoodsConfig.xlsx + - E:\Git\JL/data_execl/base_data\DailyChallengeConfig.xlsx + - E:\Git\JL/data_execl/base_data\ChapterOptionConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipTalismanaRankup.xlsx + - E:\Git\JL/data_execl/base_data\GuildBossConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildRedPackConfig.xlsx + - E:\Git\JL/data_execl/base_data\AchievementConfig.xlsx + - E:\Git\JL/data_execl/base_data\AreaConfig.xlsx + - E:\Git\JL/data_execl/base_data\BuffEffectConfig.xlsx + - E:\Git\JL/data_execl/base_data\ChallengeMissionConfig.xlsx + - E:\Git\JL/data_execl/base_data\BloodyBattleReward.xlsx + - E:\Git\JL/data_execl/base_data\ArenaSetting.xlsx + - E:\Git\JL/data_execl/base_data\ChallengeSetting.xlsx + - E:\Git\JL/data_execl/base_data\BlessingConfig.xlsx + - E:\Git\JL/data_execl/base_data\BlessingRewardPool.xlsx + - E:\Git\JL/data_execl/base_data\AdventureConfig.xlsx + - E:\Git\JL/data_execl/base_data\AdventureReward.xlsx + - E:\Git\JL/data_execl/base_data\ArenaReward.xlsx + - E:\Git\JL/data_execl/base_data\DialRewardSetting.xlsx + - E:\Git\JL/data_execl/base_data\BloodyRankConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildBossRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipSignSetting.xlsx + - E:\Git\JL/data_execl/base_data\ExpeditionHolyConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildHelpConfig.xlsx + - E:\Git\JL/data_execl/base_data\CombatControl.xlsx + - E:\Git\JL/data_execl/base_data\ChallengeStarBox.xlsx + - E:\Git\JL/data_execl/base_data\EquipTalismanaLottery.xlsx + - E:\Git\JL/data_execl/base_data\GameSetting.xlsx + - E:\Git\JL/data_execl/base_data\ExchangeActivityConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipSuiteConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipConfig.xlsx + - E:\Git\JL/data_execl/base_data\DailyTasksConfig.xlsx + - E:\Git\JL/data_execl/base_data\DifferDemonsStageConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildSetting.xlsx + - E:\Git\JL/data_execl/base_data\ChampionshipSetting.xlsx + - E:\Git\JL/data_execl/base_data\ChallengeConfig.xlsx + - E:\Git\JL/data_execl/base_data\BloodyBattleTask.xlsx + - E:\Git\JL/data_execl/base_data\GuildLevelConfig.xlsx + - E:\Git\JL/data_execl/base_data\BeStronger.xlsx + - E:\Git\JL/data_execl/base_data\BloodyBattleSetting.xlsx + - E:\Git\JL/data_execl/base_data\AudioConfig.xlsx + - E:\Git\JL/data_execl/base_data\ActivityRankingReward.xlsx + - E:\Git\JL/data_execl/base_data\EndlessMapConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipPropertyPool.xlsx + - E:\Git\JL/data_execl/base_data\ActivityDropReward.xlsx + - E:\Git\JL/data_execl/base_data\DialRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\GlobalSystemConfig.xlsx + - E:\Git\JL/data_execl/base_data\DifferDemonsConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\ExpeditionSetting.xlsx + - E:\Git\JL/data_execl/base_data\DifferDemonsBoxSetting.xlsx - E:\Git\JL/data_execl/base_data\BeginnerTask.xlsx + - E:\Git\JL/data_execl/base_data\JewelConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildSacrificeConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildWarRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\AccomplishmentConfig.xlsx + - E:\Git\JL/data_execl/base_data\HeroRankupGroup.xlsx + - E:\Git\JL/data_execl/base_data\GuideConfig.xlsx + - E:\Git\JL/data_execl/base_data\MainLevelSettingConfig.xlsx + - E:\Git\JL/data_execl/base_data\ArtResourcesConfig.xlsx + - E:\Git\JL/data_execl/base_data\DialogueViewConfig.xlsx + - E:\Git\JL/data_execl/base_data\LanguageText.csv + - E:\Git\JL/data_execl/base_data\DifferDemonsComonpentsConfig.xlsx + - E:\Git\JL/data_execl/base_data\FloodConfig.xlsx + - E:\Git\JL/data_execl/base_data\LuxuryFund.xlsx + - E:\Git\JL/data_execl/base_data\LuckyCatConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildWarConfig.xlsx + - E:\Git\JL/data_execl/base_data\ActivityRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\ExpeditionNodeConfig.xlsx + - E:\Git\JL/data_execl/base_data\HeroRankupConfig.xlsx + - E:\Git\JL/data_execl/base_data\SeverConfig.xlsx + - E:\Git\JL/data_execl/base_data\MazeTreasure.xlsx + - E:\Git\JL/data_execl/base_data\MonsterViewConfig.xlsx + - E:\Git\JL/data_execl/base_data\MonthcardConfig.xlsx + - E:\Git\JL/data_execl/base_data\TreasureSunlongTaskConfig.xlsx + - E:\Git\JL/data_execl/base_data\JewelRankupConfig.xlsx + - E:\Git\JL/data_execl/base_data\MissionEventsConfig.xlsx + - E:\Git\JL/data_execl/base_data\JewelResonanceConfig.xlsx + - E:\Git\JL/data_execl/base_data\OptionAddCondition.xlsx - E:\Git\JL/data_execl/base_data\RunesConfig.xlsx + - E:\Git\JL/data_execl/base_data\MainMapIconConfig.xlsx + - E:\Git\JL/data_execl/base_data\ExpeditionFloorConfig.xlsx + - E:\Git\JL/data_execl/base_data\JumpConfig.xlsx + - E:\Git\JL/data_execl/base_data\HeroReturn.xlsx + - E:\Git\JL/data_execl/base_data\LoginPosterConfig.xlsx + - E:\Git\JL/data_execl/base_data\MazeTreasureSetting.xlsx + - E:\Git\JL/data_execl/base_data\PlayerRole.xlsx + - E:\Git\JL/data_execl/base_data\HeroConfig.xlsx + - E:\Git\JL/data_execl/base_data\RunesPoolConfig.xlsx + - E:\Git\JL/data_execl/base_data\LevelSetting.xlsx + - E:\Git\JL/data_execl/base_data\LotterySpecialConfig.xlsx + - E:\Git\JL/data_execl/base_data\LotterySetting.xlsx + - E:\Git\JL/data_execl/base_data\TreasureSunlongConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopTechnologySetting.xlsx + - E:\Git\JL/data_execl/base_data\SystemMessageConfig.xlsx + - E:\Git\JL/data_execl/base_data\LevelDifficultyConfig.xlsx + - E:\Git\JL/data_execl/base_data\TrialSetting.xlsx + - E:\Git\JL/data_execl/base_data\RecommendTeam.xlsx + - E:\Git\JL/data_execl/base_data\WorldBossConfig.xlsx + - E:\Git\JL/data_execl/base_data\RechargeCommodityConfig.xlsx + - E:\Git\JL/data_execl/base_data\HeroLevelConfig.xlsx + - E:\Git\JL/data_execl/base_data\PlayerLevelConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopRebuildConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorldBossSetting.xlsx + - E:\Git\JL/data_execl/base_data\WorldBossTreasureConfig.xlsx + - E:\Git\JL/data_execl/base_data\TestWelfare.xlsx + - E:\Git\JL/data_execl/base_data\ChapterEventPointConfig.xlsx + - E:\Git\JL/data_execl/base_data\LotteryRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\TaskConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopFoundationConfig.xlsx - E:\Git\JL/data_execl/base_data\PlayerAppearance.xlsx - E:\Git\JL/data_execl/base_data\SevenDaysScore.xlsx - - E:\Git\JL/data_execl/base_data\BlessingConfig.xlsx - - E:\Git\JL/data_execl/base_data\BeStronger.xlsx - - E:\Git\JL/data_execl/base_data\BloodyBattleReward.xlsx - - E:\Git\JL/data_execl/base_data\ArenaRobotConfig.xlsx - - E:\Git\JL/data_execl/base_data\SeverConfig.xlsx - - E:\Git\JL/data_execl/base_data\PlayerLevelConfig.xlsx - - E:\Git\JL/data_execl/base_data\PlayerMountLevelUp.xlsx - - E:\Git\JL/data_execl/base_data\ChallengeConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuildBossConfig.xlsx - - E:\Git\JL/data_execl/base_data\BloodyBattleTask.xlsx - - E:\Git\JL/data_execl/base_data\BlessingRewardPool.xlsx - - E:\Git\JL/data_execl/base_data\BloodyRankConfig.xlsx - - E:\Git\JL/data_execl/base_data\AudioConfig.xlsx - - E:\Git\JL/data_execl/base_data\MissionEventsConfig.xlsx - - E:\Git\JL/data_execl/base_data\BloodyMessagesConfig.xlsx - - E:\Git\JL/data_execl/base_data\BloodyBattleTreasure.xlsx - - E:\Git\JL/data_execl/base_data\BloodyBattleSetting.xlsx - - E:\Git\JL/data_execl/base_data\JewelConfig.xlsx - - E:\Git\JL/data_execl/base_data\MainMapIconConfig.xlsx - - E:\Git\JL/data_execl/base_data\MapPointConfig.xlsx - - E:\Git\JL/data_execl/base_data\OptionAddCondition.xlsx - - E:\Git\JL/data_execl/base_data\SystemMessageConfig.xlsx - - E:\Git\JL/data_execl/base_data\OptionConfig.xlsx - - E:\Git\JL/data_execl/base_data\ArenaReward.xlsx - - E:\Git\JL/data_execl/base_data\MonsterViewConfig.xlsx - - E:\Git\JL/data_execl/base_data\MainLevelSettingConfig.xlsx - - E:\Git\JL/data_execl/base_data\SevenDaysActivity.xlsx - - E:\Git\JL/data_execl/base_data\RecommendTeam.xlsx - - E:\Git\JL/data_execl/base_data\MonthcardConfig.xlsx - - E:\Git\JL/data_execl/base_data\RandomName.xlsx - - E:\Git\JL/data_execl/base_data\RunesPoolConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopFoundationConfig.xlsx - - E:\Git\JL/data_execl/base_data\MazeTreasure.xlsx - - E:\Git\JL/data_execl/base_data\GlobalActivity.xlsx - - E:\Git\JL/data_execl/base_data\GlobalSystemConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopTechnology.xlsx - - E:\Git\JL/data_execl/base_data\SignInConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopTechnologySetting.xlsx - - E:\Git\JL/data_execl/base_data\TreasureSunlongConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopSetting.xlsx - - E:\Git\JL/data_execl/base_data\TrialConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorldBossSetting.xlsx - - E:\Git\JL/data_execl/base_data\TrialSetting.xlsx - - E:\Git\JL/data_execl/base_data\TestWelfare.xlsx - E:\Git\JL/data_execl/base_data\WorkShopFunctionConfig.xlsx - - E:\Git\JL/data_execl/base_data\ChallengeMapConfig.xlsx - - E:\Git\JL/data_execl/base_data\MazeTreasureSetting.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopRebuildConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorkShopEquipmentConfig.xlsx - - E:\Git\JL/data_execl/base_data\WorldBossTreasureConfig.xlsx - - E:\Git\JL/data_execl/base_data\HeroConfig.xlsx - - E:\Git\JL/data_execl/base_data\GuideConfig.xlsx - - E:\Git\JL/data_execl/base_data\LuckyCatConfig.xlsx - - E:\Git\JL/data_execl/base_data\TreasureSunlongTaskConfig.xlsx + - E:\Git\JL/data_execl/base_data\RewardItemConfig.xlsx + - E:\Git\JL/data_execl/base_data\UIConfig.xlsx + - E:\Git\JL/data_execl/base_data\QAConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopSetting.xlsx + - E:\Git\JL/data_execl/base_data\PlayerMountLevelUp.xlsx + - E:\Git\JL/data_execl/base_data\PrivilegeTypeConfig.xlsx + - E:\Git\JL/data_execl/base_data\GuildTechnology.xlsx + - E:\Git\JL/data_execl/base_data\VipLevelConfig.xlsx + - E:\Git\JL/data_execl/base_data\RoleConfig.xlsx + - E:\Git\JL/data_execl/base_data\MapPointConfig.xlsx - E:\Git\JL/data_execl/base_data\PassiveSkillConfig.xlsx + - E:\Git\JL/data_execl/base_data\PropertyConfig.xlsx + - E:\Git\JL/data_execl/base_data\PassiveSkillLogicConfig.xlsx + - E:\Git\JL/data_execl/base_data\StoreTypeConfig.xlsx + - E:\Git\JL/data_execl/base_data\TrialConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopEquipmentConfig.xlsx + - E:\Git\JL/data_execl/base_data\SevenDaysActivity.xlsx + - E:\Git\JL/data_execl/base_data\RandomName.xlsx + - E:\Git\JL/data_execl/base_data\SignInConfig.xlsx + - E:\Git\JL/data_execl/base_data\WorldBossRewardConfig.xlsx + - E:\Git\JL/data_execl/base_data\SpecialConfig.xlsx + - E:\Git\JL/data_execl/base_data\ItemConfig.xlsx + - E:\Git\JL/data_execl/base_data\TreasureTaskConfig.xlsx + - E:\Git\JL/data_execl/base_data\SkillConfig.xlsx + - E:\Git\JL/data_execl/base_data\MonsterGroup.xlsx + - E:\Git\JL/data_execl/base_data\WorkShopTechnology.xlsx + - E:\Git\JL/data_execl/base_data\SkillLogicConfig.xlsx + - E:\Git\JL/data_execl/base_data\RewardGroup.xlsx + - E:\Git\JL/data_execl/base_data\EventPointConfig.xlsx + - E:\Git\JL/data_execl/base_data\EquipTalismana.xlsx + - E:\Git\JL/data_execl/base_data\StoreConfig.xlsx + - E:\Git\JL/data_execl/base_data\OptionConfig.xlsx + - E:\Git\JL/data_execl/base_data\MainLevelConfig.xlsx + - E:\Git\JL/data_execl/base_data\MonsterConfig.xlsx _values: - - 3683090466 - - 1139991726 - - 3442665542 - - 2735169727 - - 3818277436 - - 3426199296 - - 494399256 - - 1791256076 - - 4087216726 - - 1023901955 - - 2093517668 - - 3538664386 - - 2452193378 - - 3463426852 - - 2857497983 - - 2397120416 - - 2311100102 - - 4092771759 - - 1140405166 - - 3716094234 - - 3841997530 - - 667849281 - - 1307104696 - - 1848421159 - - 157285204 - - 1393685297 - - 419862408 - - 152906837 - - 3889047146 - - 2682770579 - - 3591751192 - - 3682418109 - - 1572157444 - - 903221398 - - 932779961 - - 4198004043 - - 223506640 - - 249002466 - - 1402356663 - - 2548861080 - - 613479935 - - 3844572751 - - 427098595 - - 4201846623 - - 3517900411 - - 2568046174 - - 248718821 - - 1962642788 - - 4113729268 - - 413963702 - - 4124958540 - - 2168014676 - - 1565259591 - - 4028286306 - - 207971781 - - 1941187668 - - 3079207713 - - 936055794 - - 3033812632 - - 975867654 - - 1240442055 - - 3327547424 - - 394072854 - - 3153107712 - - 4030681066 - - 3500422824 - - 568553271 - - 3347320787 - - 716355562 - - 243491956 - - 1601584270 - - 3758691802 - - 1790592577 - - 460607005 - - 3805229002 - - 1028143699 - - 3191422176 - - 2426751794 - - 3077094752 - - 1382260277 - - 475620184 - - 2294226303 - - 3918415763 - - 2606088806 - - 3997804823 - - 3943131728 - - 2895077511 - - 1442255327 - - 2114713182 - - 341080851 - - 2523617525 - - 107718326 - - 1419043943 - - 1705732776 - - 295715991 - - 2539609122 - - 312894044 - - 3351556674 - - 2631747744 - - 476044313 - - 3705022903 - - 2193798356 - - 583891024 - - 993593708 - - 2531730849 - - 3641128642 + - 4055477448 - 373682149 + - 583891024 + - 903221398 + - 2128502189 + - 1240442055 + - 249002466 + - 2093517668 + - 3165798965 + - 1023901955 + - 667849281 + - 3079207713 + - 1382260277 + - 1790592577 + - 3507522218 + - 2792649339 + - 2682770579 + - 494399256 + - 4087216726 + - 3918415763 + - 1139991726 + - 3033812632 + - 2294226303 + - 173728414 + - 475620184 + - 2548861080 + - 413963702 + - 3716094234 + - 1572157444 + - 230994945 + - 476044313 + - 1705732776 + - 309514008 + - 732833747 + - 1848421159 + - 613479935 + - 2296996310 + - 4198004043 + - 3548626589 + - 3943131728 + - 3517900411 + - 3538664386 + - 975867654 + - 3426199296 + - 1565259591 + - 2568046174 + - 2397120416 + - 243491956 + - 4124958540 + - 3463426852 + - 3818277436 + - 1402356663 + - 2114713182 + - 3889047146 + - 2275501409 + - 2131302457 + - 107718326 + - 1744623416 + - 2050621784 + - 1550435579 + - 2168014676 + - 3347320787 + - 3153107712 + - 3591751192 + - 1941187668 + - 645205029 + - 460607005 + - 1442255327 + - 2452193378 + - 932779961 - 1064249603 + - 1360861879 + - 993593708 + - 1419043943 + - 427098595 + - 2539609122 + - 3611861224 + - 1393544882 + - 1307104696 + - 1791256076 + - 3841997530 + - 568553271 + - 1601584270 + - 419862408 + - 2479323017 + - 2523617525 + - 3683090466 + - 2735169727 + - 3077094752 + - 2748321716 + - 3220850951 + - 515856748 + - 1786980484 + - 1601813668 + - 2895077511 + - 3625815197 + - 3351556674 + - 683415129 - 1155516420 + - 2043460280 + - 2857497983 + - 341080851 + - 2631747744 + - 2311100102 + - 3551171274 + - 3641128642 + - 375751879 + - 804383039 + - 3705022903 + - 157285204 + - 152906837 + - 611904488 + - 3048495520 + - 297530923 + - 295715991 + - 3525211805 + - 3393943164 + - 2606088806 + - 2193798356 + - 2426751794 + - 3561388971 + - 2777840995 + - 811712663 + - 3676338610 + - 4291486445 + - 3442665542 + - 1393685297 + - 716355562 + - 98336120 - 2534897219 - 1952787401 - - 309514008 - - 1744623416 - - 230994945 - - 2128502189 - - 2748321716 - - 3561388971 - - 319164499 - - 2275501409 - - 173728414 - - 2131302457 - - 732833747 - - 3548626589 - - 1550435579 - - 3625815197 - - 4055477448 - - 3507522218 - - 2050621784 - - 1360861879 - - 2043460280 - - 68904690 - - 683415129 - - 297530923 - - 3418587988 - - 2296996310 - - 515856748 - - 1393544882 - - 663953244 - - 1073579488 - - 1786980484 - - 38983593 - - 804383039 - - 98336120 - - 3220850951 - - 3165798965 - - 645205029 - - 2453679101 - - 1951123603 - - 3048495520 - - 611904488 - - 3663717884 - - 3261721835 - - 811712663 - - 3525211805 - - 4291486445 - 2405621183 - - 2792649339 - - 3551171274 - - 2777840995 - - 110435588 - - 3676338610 - - 2467899613 - - 3611861224 - - 2479323017 - - 1601813668 + - 936055794 + - 3805229002 + - 4113729268 + - 3663717884 + - 319164499 + - 248718821 + - 312894044 + - 1028143699 + - 207971781 + - 68904690 - 2277423285 + - 1962642788 + - 3844572751 + - 3500422824 + - 3261721835 + - 110435588 + - 663953244 + - 38983593 + - 1951123603 + - 3997804823 + - 2531730849 + - 1140405166 + - 3758691802 + - 3327547424 + - 223506640 + - 2453679101 + - 394072854 + - 4028286306 + - 3191422176 + - 4092771759 + - 4030681066 + - 3418587988 + - 3682418109 + - 4201846623 diff --git a/BuildABs/Android/files.unity3d b/BuildABs/Android/files.unity3d index 7a034cf1f1..220d740739 100644 Binary files a/BuildABs/Android/files.unity3d and b/BuildABs/Android/files.unity3d differ diff --git a/BuildABs/Android/lz4/prefabs/ui/guide.unity3d b/BuildABs/Android/lz4/prefabs/ui/guide.unity3d index 8e05c326f2..6883d8c82c 100644 Binary files a/BuildABs/Android/lz4/prefabs/ui/guide.unity3d and b/BuildABs/Android/lz4/prefabs/ui/guide.unity3d differ diff --git a/BuildABs/Android/lzma/luabytes.unity3d b/BuildABs/Android/lzma/luabytes.unity3d index e462fbe9a5..2b356f65b7 100644 Binary files a/BuildABs/Android/lzma/luabytes.unity3d and b/BuildABs/Android/lzma/luabytes.unity3d differ diff --git a/data_execl/base_data/HeroConfig.xlsx b/data_execl/base_data/HeroConfig.xlsx index ae7f9beea4..f5303bcb82 100644 Binary files a/data_execl/base_data/HeroConfig.xlsx and b/data_execl/base_data/HeroConfig.xlsx differ diff --git a/data_execl/base_data/RecommendTeam.xlsx b/data_execl/base_data/RecommendTeam.xlsx index 48b378ae45..a7ee406ae6 100644 Binary files a/data_execl/base_data/RecommendTeam.xlsx and b/data_execl/base_data/RecommendTeam.xlsx differ