Commit Graph

3746 Commits (64dcd0cf80efef62b1e19e2ce74821effa2979fc)

Author SHA1 Message Date
ZhangBiao 64dcd0cf80 【增加特效】增加混乱特效 2020-12-26 11:37:20 +08:00
liuyipeng 5e6360116f 增加活动及系统需求图片资源 2020-12-25 19:53:22 +08:00
gaoxin c16ab8cdee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-25 15:50:23 +08:00
gaoxin 58a6c8c2db Merge remote-tracking branch 'origin/gx/xma_local' into master_develop 2020-12-25 15:49:59 +08:00
gaoxin aaf7a4f470 【引导】修复会部分功能重复开启会重复引导的问题 2020-12-25 15:34:38 +08:00
jiaoyangna 7c665597ff 【逍遥游优化】逍遥游玩法优化内容 2020-12-25 14:49:56 +08:00
wangzhenxing d6d8590ce2 [战斗]修改切磋判断胜负条件 2020-12-25 15:40:13 +09:00
ZhangBiao 20e451dfcd 【森罗幻境】红点修改
(cherry picked from commit 6945cbcacf)
2020-12-25 12:09:12 +08:00
wangzhenxing 6f38041f2e [优化]魂宝灵宝加号点击区域扩大 2020-12-25 10:57:32 +09:00
wangzhenxing a839db7119 [优化]【ID1007687】
【优化】魂宝、灵宝各自添加加号,点击后显示获取途径以及跳转
2020-12-24 19:57:19 +09:00
ZhangBiao b094a73fa7 【降妖夺宝】界面调整
(cherry picked from commit 6befa383c8)
2020-12-24 18:37:28 +08:00
jiaoyangna bbf155d7be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 18:02:34 +08:00
jiaoyangna 876fddb02b 逍遥 红点提交 2020-12-24 18:02:21 +08:00
ZhangBiao e5b00c5cd9 【无尽副本】重置事件点无法触碰修复 2020-12-24 18:00:02 +08:00
ZhangBiao 46500fd5f9 【森罗幻境】炸弹炸小怪也计入击杀 2020-12-24 17:13:29 +08:00
ZhangBiao 5e1073fc80 【降妖夺宝】点击抽卡时可以切换其他界面修复
(cherry picked from commit 601eefb120)
2020-12-24 16:58:30 +08:00
jiaoyangna 5dbb9796ed Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 16:40:59 +08:00
jiaoyangna dcc33d0124 逍遥 红点 2020-12-24 16:40:54 +08:00
guowei a4bcc10bd6 Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua
2020-12-24 16:37:33 +08:00
ZhangBiao 150ec3eb2f 【道具使用跳转】跳转后返回关闭弹窗界面 2020-12-24 16:33:15 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna e95ae4724b 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:32 +08:00
jiaoyangna 29c5c08ea4 【优化】放生灵兽添加开启等级。 2020-12-24 16:19:22 +08:00
jiaoyangna e7698bd4e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 16:11:12 +08:00
jiaoyangna 3782230926 逍遥红点 2020-12-24 16:11:07 +08:00
zhangqiang 26d714e1c5 【优化】等级成长礼 2020-12-24 16:06:10 +08:00
ZhangBiao bc582d93e0 【增加跳转】化灵符跳转零售特惠 2020-12-24 15:57:51 +08:00
ZhangBiao a3833e153e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 15:41:03 +08:00
ZhangBiao b2f8d14470 【道具使用跳转】使用跳转修改,活动道具要大于10000 2020-12-24 15:40:30 +08:00
jiaoyangna 9777af3709 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 15:36:02 +08:00
jiaoyangna a2442f3f39 逍遥游 红点提交 2020-12-24 15:35:56 +08:00
ZhangBiao 37a426d46d Merge branch '0功能/1230版本优化内容' into master_develop
# Conflicts:
#	Assets/LuaFramework/Scripts/SurplusScripts.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/Example.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/Mgr.meta
#	Assets/LuaFramework/Scripts/SurplusScripts/MixCode.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_100912bgj_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/UI/common/UI_schl_loop.ogg.meta
#	Assets/ManagedResources/PublicArtRes/Models/Materials.meta
2020-12-24 15:17:39 +08:00
ZhangBiao c57944e742 Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容 2020-12-24 15:13:15 +08:00
ZhangBiao 78ead0e8ad 【大闹天宫】一键上阵招募英雄 2020-12-24 15:13:03 +08:00
guowei f25f253479 【合成优化修改】 2020-12-24 15:03:14 +08:00
jiaoyangna 3848c3d684 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 14:36:17 +08:00
jiaoyangna 79ce16086e 【优化】放生灵兽添加开启等级。 2020-12-24 14:36:06 +08:00
jiaoyangna 54ea5e41b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 14:23:34 +08:00
jiaoyangna 12724f650e 【优化】放生灵兽添加开启等级。 2020-12-24 14:23:29 +08:00
ZhangBiao 8376d74230 【无尽副本】战斗失败自动复位时,自动进行一次一键上阵 2020-12-24 14:13:58 +08:00
ZhangBiao 43372fd0f5 【新将来袭】左上货币刷新不及时修复
(cherry picked from commit 8f9a58468f)
2020-12-24 14:07:56 +08:00
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
wangzhenxing 22d9049fae [优化] 巅峰争霸赛,切磋超时改为只判断总伤害,不再判断总治疗 2020-12-24 14:30:28 +09:00
jiaoyangna 9ad8d2f635 【优化】巅峰赛,十绝阵预告图标双行文字优化 2020-12-24 10:45:50 +08:00
jiaoyangna 171e9a4690 【优化】巅峰赛,十绝阵预告图标双行文字优化 2020-12-24 10:45:15 +08:00
jiaoyangna 3a796df0db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-12-24 10:38:32 +08:00
jiaoyangna bf33602c32 【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名) 2020-12-24 10:38:28 +08:00
jiaoyangna 0054f5e646 【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名) 2020-12-24 10:37:38 +08:00
jiaoyangna c0547ab372 [所向披靡] 提交 2020-12-24 10:25:09 +08:00
jiaoyangna d0982716b3 [所向披靡] 提交 2020-12-24 10:24:11 +08:00