Commit Graph

204 Commits (4950e48b2f18014602f79e9b20bb8de20497bc95)

Author SHA1 Message Date
ZhangBiao f98e81bb37 【本地化】无尽副本界面左上右上调整 2021-02-23 20:57:26 +08:00
zhangqiang e8ee62f9ab 【大闹天宫】重置提示错误 2021-02-23 10:40:58 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
guowei 344ec52500 【巅峰赛头像修改】 2021-01-18 15:07:23 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
DESKTOP-98AVA47\Administrator 040971534e 【巅峰赛限时头像修改】 2021-01-15 21:06:48 +08:00
jiaoyangna 3e99568f24 红点提交 2021-01-13 14:44:37 +08:00
jiaoyangna 5e90700036 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-13 14:30:00 +08:00
jiaoyangna 687c5fa957 红点提交 2021-01-13 14:29:56 +08:00
ZhangBiao a75d553a6a 【无尽副本】世界等级显示1级 修改 2021-01-13 11:04:28 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
ZhangBiao 574a0da116 【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复 2020-12-29 10:24:50 +08:00
jiaoyangna 0d40e26a34 副本红点修改 2020-12-28 10:03:24 +08:00
ZhangBiao 49dc0f172c 【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9)
2020-12-24 18:01:11 +08:00
ZhangBiao 0692fbf799 【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
2020-12-18 12:02:42 +08:00
ZhangBiao 4c73219b39 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
jiaoyangna 20564aee0f 【日常副本】解锁所有副本后,没有自动滚动到最后一个副本 2020-11-19 15:28:21 +08:00
ZhangBiao 8df6de20e5 【副本】isInMap字段删除bug修复 2020-11-16 15:24:09 +08:00
ZhangBiao e3bd86ef08 轩辕 修改 提交
(cherry picked from commit 27f8331e62)
2020-10-19 21:25:12 +08:00
jiaoyangna 8c5132185b 轩辕宝镜黑屏问题解决 2020-10-10 16:05:02 +08:00
gaoxin 8e3e25a450 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:32:37 +08:00
jiaoyangna e7a695553f 轩辕宝镜关闭时销毁时间 2020-10-24 09:44:56 +08:00
zhangqiang 297d71d2ff 线上问题 无尽副本轮换前5分钟无法进入 2020-10-09 15:21:00 +08:00
jiaoyangna c7836b8aea 编队界面修改提交 2020-09-28 21:08:12 +08:00
JieLing bd21a12b98 轩辕commit 2020-09-28 15:08:35 +08:00
JieLing b7cd64f977 开服狂欢不可完成奖励修改,日常任务弹活动关闭异常 2020-09-28 14:11:00 +08:00
jiaoyangna 947d647266 轩辕修改提交 2020-09-27 20:40:30 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
ZhangBiao 63cde2092d 无尽副本界面动效增加 2020-09-04 17:46:27 +08:00
zhangqiang 571b8e082a shipei 2020-09-02 17:38:56 +08:00
jiaoyangna 35712b99de xuanyuan commit 2020-09-02 15:31:02 +08:00
jiaoyangna 8d11549d86 大闹天宫红点修改 2020-09-09 10:30:39 +08:00
jiaoyangna 8d19f5c583 prefab commit 2020-09-09 10:11:47 +08:00
jiaoyangna 933aadbf65 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-01 18:36:18 +08:00
jiaoyangna 00b75cc097 prefab commit 2020-09-01 18:36:14 +08:00
gaoxin 97eaf77009 主界面底部界面经验条显示调整 2020-09-01 17:12:00 +08:00
ZhangBiao e74c120d01 大闹天宫重置红点、无尽副本界面红点 2020-09-01 11:25:38 +08:00
jiaoyangna 2bf39b8a9c 副本红点提交 2020-08-31 15:01:20 +08:00
jiaoyangna 366343b72b 副本红点修改提交 2020-08-31 13:58:47 +08:00
jiaoyangna 0806d1d497 在副本未开启时不显示红点 2020-08-31 10:39:56 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
ZhangBiao 52643c3937 大闹天宫入口开启修改 2020-08-27 15:18:17 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
ZhangBiao 1e4f936810 无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复 2020-08-27 10:49:44 +08:00
gaoxin db0a09ab68 修复副本界面通关后战斗力背景图标不关闭的问题 2020-08-26 22:37:31 +08:00
jiaoyangna 1482d308cb 日常副本修改 2020-08-26 20:37:31 +08:00
gaoxin 4b41b5def9 副本界面显示优化 2020-08-26 20:20:40 +08:00
jiaoyangna a52ea7f6b7 qinglong commit 2020-08-26 14:04:26 +08:00
gaoxin d73b816bb3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 12:26:33 +08:00
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +08:00
jiaoyangna 78ea78303d 日常 轩辕 列表优化 2020-08-26 12:23:10 +08:00
jiaoyangna 59204790d2 xuanyuan commit 2020-08-26 10:58:41 +08:00
zhangqiang 2ea0c63999 日常副本 2020-08-25 18:39:57 +08:00
zhangqiang 060cc081bb 修改bug 2020-08-25 17:50:52 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
gaoxin e806410e8a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-24 15:25:23 +08:00
ZhangBiao 939fa0227a 无尽入口例会、化虚进入修复、剪影仙踪 2020-08-24 15:20:00 +08:00
gaoxin 4f8026425d sdk添加上传新手数据的接口 2020-08-22 19:14:58 +08:00
ZhangBiao 8de86ce4ac 无尽副本入口 2020-08-22 17:05:37 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00
ZhangBiao 32eadd13ef 试炼 2020-08-19 17:18:38 +08:00
ZhangBiao 8f786147d3 2020-08-18 16:36:24 +08:00
ZhangBiao 448c5d3b17 无尽_新重做前的提交 2020-08-18 15:48:41 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
ZhangBiao 9f8b553626 试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
2020-08-18 10:46:33 +08:00
jiaoyangna 3e9fcb7e71 xuanyuan update 2020-08-18 10:33:19 +08:00
jiaoyangna 92447e21a8 列表优化提交 2020-08-18 10:22:24 +08:00
jiaoyangna 7ff435c765 xuanyuan update 2020-08-17 15:48:40 +08:00
jiaoyangna 740eb7253d xuanyuan commit 2020-08-14 20:41:07 +08:00
jiaoyangna 84f82d488d live2d commit 2020-08-14 17:43:24 +08:00
jiaoyangna 0b157b6ee8 轩辕宝镜入口替换 2020-08-14 16:09:00 +08:00
jiaoyangna 4604df2d0b 修改轩辕副本立绘 2020-08-14 14:36:24 +08:00
jiaoyangna 40b9550c54 修改轩辕副本立绘提交 2020-08-14 14:35:48 +08:00
jiaoyangna 1f7b161087 五星成长礼修改提交 2020-08-14 13:32:55 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna a9ebd162ec 轩辕 提交 2020-08-12 21:10:36 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
jiaoyangna 96d47d34a8 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
2020-08-12 14:17:01 +08:00
jiaoyangna 7bee1280b3 xuanyuan update 2020-08-12 14:13:28 +08:00
jiaoyangna e372c84cdb xuanyuan 2020-08-12 13:34:07 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
jiaoyangna 9f186311b3 xuanyuan 2020-08-11 15:11:33 +08:00
jiaoyangna 16e1699e65 no message 2020-08-11 11:58:41 +08:00
jiaoyangna 179632ca21 no message 2020-08-11 11:56:03 +08:00
jiaoyangna 6f05841519 no message 2020-08-11 11:00:30 +08:00