Commit Graph

3030 Commits (c1276ff0c4972d22e29afd9896e75538d05b641e)

Author SHA1 Message Date
ZhangBiao 2c5159fc11 【五级图标显示】 2021-03-24 09:48:35 +08:00
jiaoyangna 3bd78655a2 灵兽提交 2021-03-23 20:33:21 +08:00
ZhangBiao c9670aae58 【五级前不显示任何活动】 2021-03-23 20:28:31 +08:00
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
jiaoyangna 1f036b6793 添加头像置灰 2021-03-23 17:20:48 +08:00
jiaoyangna fbed4d34ff 解锁条件修改 2021-03-23 17:10:04 +08:00
jiaoyangna 298946dd2d Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-03-23 16:54:46 +08:00
jiaoyangna 44806a302d 红点提交 2021-03-23 16:52:19 +08:00
gaoxin c5d1dab173 【养成】升级时,战力光效层级不正确 2021-03-23 16:34:19 +08:00
zhangqiang 3618464a15 【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格 2021-03-23 16:22:57 +08:00
gaoxin 8b62a5cd43 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 16:15:40 +08:00
gaoxin 3a8a8ddeeb 【登录】流程修改,添加错误码处理 2021-03-23 16:15:32 +08:00
jiaoyangna 001d6e16bc 主城入口提交 2021-03-23 16:02:22 +08:00
zhangqiang c4c5bb1074 【神将没有升级材料依旧会出现小红点】 2021-03-23 15:53:59 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
zhangqiang a56d71c4f8 【公会副本】bug修改 2021-03-23 15:25:00 +08:00
jiaoyangna cfa63c1830 筛选提交 2021-03-23 15:23:37 +08:00
jiaoyangna 2e31e176cc 红点提交 2021-03-23 15:16:38 +08:00
jiaoyangna 218110d709 筛选排序提交 2021-03-23 14:56:13 +08:00
jiaoyangna 9e19cd5322 红点提交 2021-03-23 14:13:02 +08:00
gaoxin 96fb520ace 【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进 2021-03-23 11:17:55 +08:00
jiaoyangna cd984427c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 11:00:25 +08:00
jiaoyangna b859239c90 首充跳转修改 2021-03-23 10:59:59 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
ZhangBiao 7bac8e3d8c 【八日领奖】需要改成可查看宝箱 2021-03-22 20:56:36 +08:00
ZhangBiao dc38d33738 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 20:42:02 +08:00
ZhangBiao dcc09321dd 【自选宝箱】按钮覆盖修改 2021-03-22 20:41:51 +08:00
gaoxin 7fb9a6ea71 【战斗】主动上报日志功能关闭 2021-03-22 20:37:34 +08:00
ZhangBiao 207d85e2a2 【牛气冲天】提交 2021-03-22 20:08:18 +08:00
gaoxin d7ac77375f 【bug】修复公会boss点击挑战再返回伤害列表不显示的问题 2021-03-22 19:50:01 +08:00
gaoxin 3c98337b33 【bug】战斗跳过未解锁文字提示修改 2021-03-22 19:44:24 +08:00
jiaoyangna a79e67097e 天书秘卷提交 2021-03-22 17:05:00 +08:00
gaoxin c3961b9501 【公会】邀请,红包,副本文字显示修改 2021-03-22 16:25:10 +08:00
jiaoyangna 08f41d473c 天书秘卷提交 2021-03-22 16:22:55 +08:00
zhangqiang d9dcba2574 【称号坐骑皮肤-----------】开始 2021-03-22 16:16:25 +08:00
jiaoyangna 56ee509832 天书秘卷 提交 2021-03-22 15:28:27 +08:00
jiaoyangna a4facd8d13 天书秘卷 2021-03-22 15:16:29 +08:00
gaoxin 4b8f5cd535 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:54:18 +08:00
gaoxin f2de4a8a53 【大闹天宫】圣物品质框默认+3 2021-03-22 13:54:14 +08:00
zhangqiang 830f7d3dd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:48:06 +08:00
zhangqiang dc5d0a2d12 【修复主城人物层级bug】 2021-03-22 13:47:59 +08:00
ZhangBiao 3d665074a2 【牛气冲天】提交 2021-03-22 11:09:49 +08:00
gaoxin 7e0e5e198a 【sdk】添加上传支付订单id的接口 2021-03-20 22:12:51 +08:00
gaoxin fccfeedba0 【sdk】避免出现sdk初始化慢导致无法自动打开登录界面的问题 2021-03-20 15:00:44 +08:00
ZhangBiao cae60a1318 【自选宝箱】界面调整 2021-03-19 23:54:24 +08:00
ZhangBiao 2f658f1157 【装备种类显示】 2021-03-19 21:30:22 +08:00
gaoxin da1ad31e4c 【bug】修复兑换码按钮不显示的问题 2021-03-19 21:01:27 +08:00
gaoxin 835ebf10c7 【bug】头像,头像框判断是否要进入版本 2021-03-19 20:24:39 +08:00
gaoxin 61ada763b2 【bug】修复好友请求无法正常显示的问题 2021-03-19 18:41:25 +08:00
gaoxin 9fe7b94196 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 18:14:57 +08:00
gaoxin c6674710f9 【引导】2倍速引导增加 2021-03-19 18:14:52 +08:00
zhangqiang 853db67d9a 【化虚坛去掉屏蔽神将】 2021-03-19 18:00:46 +08:00
gaoxin 37668ce757 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 17:52:41 +08:00
gaoxin fd1ea5fa67 【引导】npc修改 2021-03-19 17:52:36 +08:00
ZhangBiao 0adef18b30 【大闹天宫】战斗结束点击无反应 2021-03-19 17:05:26 +08:00
jiaoyangna 66287434ea 天书秘卷 提交 2021-03-19 16:53:00 +08:00
ZhangBiao dfb4de8811 【限时神装】时间格式修改 2021-03-19 16:30:34 +08:00
ZhangBiao f30186c57e 【关卡】应该改成按钮 2021-03-19 16:18:10 +08:00
ZhangBiao 65f994b37b 【牛气冲天】提交 2021-03-19 15:16:49 +08:00
jiaoyangna ec8ff74e61 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-19 15:11:37 +08:00
jiaoyangna beb93b5ed9 天书秘卷 2021-03-19 14:37:24 +08:00
gaoxin 1b3e9460fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 14:19:13 +08:00
gaoxin e9968d8517 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
zhangqiang 194160cc40 【2倍速修改】 2021-03-19 11:45:08 +08:00
gaoxin dfcd8e7eb1 【tapdb】userid改为账号id 2021-03-19 11:37:50 +08:00
gaoxin 367f319b81 【优化】删除登录区服显示 2021-03-19 11:37:22 +08:00
gaoxin 2842fed5e3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 11:10:55 +08:00
gaoxin d5d88bbb8a 【引导】删除假战斗 2021-03-19 11:10:48 +08:00
jiaoyangna cbfad48efb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 11:09:11 +08:00
jiaoyangna f51a4305ab 每日豪礼修改提交 2021-03-19 11:08:58 +08:00
ZhangBiao 037d8414d4 【升级豪礼】从第一个开始 2021-03-19 10:33:37 +08:00
ZhangBiao c4700534c4 【限时神装】假战斗报错 2021-03-18 23:18:43 +08:00
ZhangBiao 477d3b768a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 21:15:11 +08:00
ZhangBiao e9e002310b 【大闹天宫】 2021-03-18 21:15:03 +08:00
wangzhenxing 6569aaaf08 【假战斗】剧情添加跳过 2021-03-18 20:53:46 +08:00
jiaoyangna c9f20bf928 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 18:36:24 +08:00
jiaoyangna b9c5d93f0f 【每日豪礼】领完不消失 2021-03-18 18:36:21 +08:00
zhangqiang 0ced995afe 【分解魂印提示】分解魂印提示不当(策划说改成,金色或金色以上) 2021-03-18 16:13:47 +08:00
zhangqiang cc9b681875 【碎片】用碎片合成神将点击查看详情有问题 2021-03-18 16:09:44 +08:00
zhangqiang 7a6a0b1451 【贪婪节点修改】 2021-03-18 15:53:44 +08:00
ZhangBiao f704847601 2021-03-18 15:51:14 +08:00
ZhangBiao b1013b0069 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:23:23 +08:00
ZhangBiao 7001e46f6c 2021-03-18 15:23:14 +08:00
zhangqiang 6cb698f147 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:16:13 +08:00
zhangqiang e8acbe1c86 【自选箱提交】 2021-03-18 15:15:54 +08:00
ZhangBiao f8d0c03e63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:15:32 +08:00
ZhangBiao e8928e062d 【道具自选箱】 2021-03-18 15:15:16 +08:00
gaoxin 115e4aaa18 【红点】成长礼包红点不显示修复 2021-03-18 15:02:13 +08:00
ZhangBiao b479a8fa8b 首领来袭 2021-03-18 14:40:47 +08:00
ZhangBiao db3340d779 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:10:29 +08:00
ZhangBiao 97ae8966d7 【充值界面】 2021-03-18 14:10:23 +08:00
gaoxin 5e423f2ebe 【灵兽】灵兽入口随功能状态显隐 2021-03-18 13:36:01 +08:00
gaoxin 6246da5bb6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:03:57 +08:00
gaoxin 811594ef57 【bug】修复好友列表不能滑动的问题 2021-03-18 12:03:51 +08:00
jiaoyangna f49d2b76f0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:01:39 +08:00
jiaoyangna e7803d68c8 逍遥boss 提交 2021-03-18 12:01:35 +08:00
ZhangBiao 63b9348e54 充值界面 2021-03-18 11:31:10 +08:00
jiaoyangna 0209a90c27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 11:13:26 +08:00
jiaoyangna 11a5cf2a99 【首充】孙悟空页面详情天赋显示错误 2021-03-18 11:13:10 +08:00
zhangqiang 88b1230c42 【本地化魂印】专属魂印适用范围不显示 2021-03-18 10:41:54 +08:00
ZhangBiao e26d838851 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:30:29 +08:00
ZhangBiao 2ba7583da3 【中文元修改】 2021-03-18 10:27:36 +08:00
gaoxin 3498c8803b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:16:47 +08:00
gaoxin 4c30b42f61 【bug】修复替换装备时按钮文字错误 2021-03-18 10:16:34 +08:00
ZhangBiao fb7bdbbe29 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:11:10 +08:00
ZhangBiao 8c90b7fe7c 【自选宝箱】 2021-03-18 10:11:00 +08:00
gaoxin 778ed8e886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:07:08 +08:00
gaoxin 64ee4697f5 【bug】点击替换装备,装备图标跟穿戴着的图标一样 2021-03-18 10:07:03 +08:00
jiaoyangna 4715c7d469 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 20:43:50 +08:00
jiaoyangna 9f1f204588 主界面提交 2021-03-17 20:43:47 +08:00
ZhangBiao 1688bd41fb 【八日登录】图片位置修改 2021-03-17 18:01:58 +08:00
JieLing ca3bcb612d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:37:06 +08:00
JieLing 40c0ed6075 【sdk】国内sdk适应修改 2021-03-17 17:36:50 +08:00
jiaoyangna f35e638e22 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:34:20 +08:00
jiaoyangna d6b008742b gm 提交 2021-03-17 17:34:14 +08:00
zhangqiang f2b3df9721 【修改提交】 2021-03-17 17:27:53 +08:00
zhangqiang 6eb9050d4a 【轩辕宝镜】不进版本但是可以通过穿戴界面道具跳转 2021-03-17 17:17:20 +08:00
zhangqiang d5f34e516c 【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉 2021-03-17 16:56:02 +08:00
gaoxin 8cf2670d6b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:54:02 +08:00
gaoxin 80209e4a35 【引导战斗】加入 2021-03-17 16:53:48 +08:00
wangzhenxing 7185fb678f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:46:02 +08:00
wangzhenxing 433a6b243c [战斗]=============被动191修改,buff图标叠加添加免疫和连接符 2021-03-17 16:45:26 +08:00
gaoxin 2db591318f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:45:19 +08:00
gaoxin 6f52e3e338 【bug】统一一键合成时的文字提示 2021-03-17 16:45:13 +08:00
wangzhenxing 7d576d8c0c [战斗]=============被动225修改 增加最大血量客户端特殊处理 2021-03-17 16:43:28 +08:00
jiaoyangna adb3a1e750 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:20:22 +08:00
ZhangBiao c8661ab384 【首领来袭】任务过小修改, 2021-03-17 16:17:41 +08:00
jiaoyangna 5963eb170b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:04:31 +08:00
ZhangBiao b630889891 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:01:02 +08:00
ZhangBiao 17990d0dc8 【自选宝箱】修改 2021-03-17 16:00:52 +08:00
zhangqiang 125a393167 【修bug】 2021-03-17 15:54:45 +08:00
gaoxin aa30b1ed6e 【bug】修复升级神将立即关闭界面,再次打开界面时显示错误 2021-03-17 15:29:23 +08:00
jiaoyangna 95351b5bd1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 15:03:54 +08:00
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna 9f2d86c2a1 天书秘卷 2021-03-17 14:29:34 +08:00
jiaoyangna ee30858c07 添加一个红点 2021-03-17 14:20:51 +08:00
jiaoyangna 909ed03c04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 13:33:22 +08:00
ZhangBiao bf3d732b69 【中文本地化】 2021-03-17 12:05:44 +08:00
jiaoyangna 32c239fcb2 活动开启条件提交 2021-03-17 12:02:32 +08:00
jiaoyangna 31b808209e 主界面修改提交 2021-03-17 11:55:02 +08:00
jiaoyangna dfd3c4acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 11:54:40 +08:00
ZhangBiao 15dec90220 【本地化】修改 2021-03-17 11:29:43 +08:00
jiaoyangna a7c5bcce1a 主界面修改提交 2021-03-17 11:07:47 +08:00
jiaoyangna 5d89fe2a79 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 10:38:11 +08:00
jiaoyangna 36f4efedc8 主城优化修改 2021-03-17 10:38:07 +08:00
gaoxin 15103f5032 【ios】引导战斗添加 2021-03-17 09:52:50 +08:00
jiaoyangna 0cdd115646 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-16 18:32:52 +08:00
gaoxin c8c81215ce 【图鉴】根据表配置控制显示隐藏 2021-03-16 18:06:57 +08:00
jiaoyangna 3fe1267e86 功能隐藏
(cherry picked from commit 2f2cf25801)
2021-03-16 17:43:59 +08:00
jiaoyangna 2f2cf25801 功能隐藏 2021-03-16 17:43:47 +08:00
jiaoyangna 8ec9b44626 功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e)
2021-03-16 17:38:29 +08:00
jiaoyangna 147d358e11 天书密卷 2021-03-16 17:37:32 +08:00
jiaoyangna 0b538b6e1e 功能不进版本隐藏按钮 2021-03-16 17:36:30 +08:00
ZhangBiao e758730d4a 【首领来袭】 2021-03-16 17:25:11 +08:00
ZhangBiao 003d2e8ba5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-16 17:09:35 +08:00
ZhangBiao c2cab749f4 【首领来袭】位置调整 2021-03-16 17:09:18 +08:00
JieLing c945f53946 【修改bug】提交 竞技场 + 试炼奖励优化list重叠 2021-03-16 16:06:55 +08:00
ZhangBiao 6dda93f175 【国内测试】无法登录修复 2021-03-16 15:29:38 +08:00
ZhangBiao 4528e23541 Merge branch 'china/dev' into 0活动开发聚集地/限时神装 2021-03-16 14:49:47 +08:00
jiaoyangna adabb23e0c 灵兽羁绊修改提交 2021-03-16 13:49:32 +08:00
jiaoyangna 27859eec4f 灵兽羁绊修改提交 2021-03-16 11:10:09 +08:00
JieLing 7215433a87 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-16 10:30:37 +08:00
JieLing ab8d5b8a2d 【国内先遣修改】 2021-03-16 10:25:41 +08:00
ZhangBiao d82eb7f88a 【战斗开始过快修复】 2021-03-15 20:35:16 +08:00
ZhangBiao 95080d3da7 2021-03-15 18:38:26 +08:00
ZhangBiao 49701bcbec 【首领来袭】战斗报错修复 2021-03-15 18:37:16 +08:00
ZhangBiao 1b06ae40c9 【battlelogic】增加log 2021-03-15 17:11:52 +08:00
ZhangBiao 86fdb9395b Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
2021-03-15 10:51:17 +08:00
ZhangBiao 37e948c9b9 【限时神装】 2021-03-13 15:09:34 +08:00
jiaoyangna b63d62c7f1 文字修改提交 2021-03-13 14:25:25 +08:00
jiaoyangna b260a2d0d8 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 14:22:54 +08:00
jiaoyangna c7860fec99 文字修改提交 2021-03-13 14:22:48 +08:00
ZhangBiao e9cadb6cb9 重登确认框 2021-03-13 14:00:27 +08:00
ZhangBiao 0779a816e0 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-13 12:57:41 +08:00
ZhangBiao 5334a7c7da 【首领来袭】 2021-03-13 12:57:31 +08:00
jiaoyangna 8656408ac9 宝箱状态修改 2021-03-12 18:18:25 +08:00
jiaoyangna 388f68d39d 鸿蒙提示修改 2021-03-12 17:28:10 +08:00
jiaoyangna 446d9c85ea 添加妖晶不足提示 2021-03-12 17:24:24 +08:00
jiaoyangna 5ed4d34201 合并修改提交 2021-03-12 17:08:51 +08:00
jiaoyangna aa94edf1d7 Merge branch 'xma/dev' into 0功能/本周版本优化内容 2021-03-12 16:41:18 +08:00
jiaoyangna 579f2806c3 竞技守卫名字修改提交
(cherry picked from commit d3efa809d8)
2021-03-12 16:35:55 +08:00
jiaoyangna fa64d90f08 社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea)
2021-03-12 15:55:57 +08:00
ZhangBiao 4f326e59e5 【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新 2021-03-12 15:10:55 +08:00
ZhangBiao 51c0b51a87 【本地化】魂灵宝处需要修改 2021-03-12 15:07:17 +08:00
ZhangBiao 8aad1eee56 【限时神装】 2021-03-12 14:31:53 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna dd706075d2 Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
2021-03-12 14:30:10 +08:00
jiaoyangna 8430af12af 文字提交 2021-03-12 14:24:41 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +08:00
jiaoyangna 2a6a2e69da 图片提交,巅峰赛竞技守卫名字提交 2021-03-12 12:08:24 +08:00
jiaoyangna 5acc67ead5 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-03-12 11:11:25 +08:00
jiaoyangna a018c485c0 哪吒修改提交 2021-03-12 11:11:14 +08:00
wangzhenxing 491a6f311a [战斗]========= buff 叠层表现修改 2021-03-12 11:04:06 +08:00
jiaoyangna 04ab1e5451 社稷大典奖励领取提交 2021-03-12 10:32:32 +08:00
ZhangBiao 24ea537bba Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
2021-03-11 15:15:09 +08:00
ZhangBiao b926310982 【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败) 2021-03-11 15:05:38 +08:00
ZhangBiao 9b30532bda 【图鉴】十星神将图鉴等级显示错误 2021-03-11 14:32:08 +08:00
ZhangBiao 1e2dc32804 【列表打开动画】森罗幻境选择神将界面,每选中一个头像都会播一遍动画 2021-03-11 14:28:44 +08:00
jiaoyangna 292069ba5d 活动提交 2021-03-11 10:59:49 +08:00
ZhangBiao 4631f663a8 【本地化】魂灵宝处需要修改 2021-03-11 10:41:34 +08:00