Commit Graph

9846 Commits (abbcc52f0144ad9560b9a0ae4127e0b43b89c41a)
 

Author SHA1 Message Date
wangzhenxing 072c44d495 [bug]======【ID1018713】
【成就】战力目标成就进度超框,需要改为缩写
2021-10-14 16:35:34 +08:00
ZhangBiao 5a4a42594d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 16:17:25 +08:00
ZhangBiao b08af858a9 【牛气冲天】提交 2021-10-14 16:16:52 +08:00
ZhangBiao 67026aa355 Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-10-14 16:13:07 +08:00
ZhangBiao 8ad554a64d 【御剑行】提交 2021-10-14 16:10:54 +08:00
wangzhenxing 66c50b6731 添加屏蔽,点挑战后不能再拖动 2021-10-14 15:48:30 +08:00
wangzhenxing 25bce8b8d4 bug修改提交 2021-10-14 15:38:47 +08:00
ZhangBiao 3d1a5ebd4c 【御剑行】提交 2021-10-14 15:30:46 +08:00
jiaoyangna f964d2a10c 添加,缩短魂印名字 2021-10-14 15:16:14 +08:00
jiaoyangna 204aba3fde 缩短魂印名字 2021-10-14 15:14:07 +08:00
jiaoyangna ac0221b89f 白金装备修改提交 2021-10-14 15:05:36 +08:00
jiaoyangna ad9ee953dc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 14:13:16 +08:00
jiaoyangna ea342f1916 装备篇资源提交 2021-10-14 14:13:03 +08:00
wangzhenxing f0fcd144f2 [战斗]===========被动添加 354 355 2021-10-14 13:54:07 +08:00
jiaoyangna 842c9b7592 白金装备属性加成添加 2021-10-14 12:39:40 +08:00
jiaoyangna 8b4f447466 坐骑立绘提交 2021-10-14 12:15:20 +08:00
jiaoyangna 3cbffeab4a 【ID1010437】
【优化】开服玉帝御剑坐骑活动
2021-10-14 12:14:26 +08:00
jiaoyangna 4f580146bd 【ID1010465】
增加白金装备图鉴
2021-10-14 12:01:55 +08:00
ZhangBiao 4eb6e1d9ae 【御剑行】提交 2021-10-14 11:25:44 +08:00
ZhangBiao 2101e974ad 【御剑行】增加投注滑动条 2021-10-14 09:53:51 +08:00
ZhangBiao 81166ae892 【牛气冲天】修改,待后端修改数据,待增加新活动类型 2021-10-13 19:43:25 +08:00
wangzhenxing 7dce99c08c 玉虚修改 2021-10-13 19:35:30 +08:00
ZhangBiao bb9533781d 【御剑行】提交 2021-10-13 19:15:39 +08:00
ZhangBiao 414ab1f3d9 【御剑行】提交 2021-10-13 17:38:32 +08:00
ZhangBiao 018c09d69c 【御剑行】竞猜,差一个三级弹窗 2021-10-13 17:30:26 +08:00
liujiaqi b24cd4e168 【资源】敬请期待 2021-10-13 16:33:42 +08:00
yuanshuai dd56c24ae8 点金前端显示bug修改 2021-10-13 16:02:23 +08:00
wangzhenxing ee434c85cc 结算界面名字显示修改 2021-10-13 15:45:42 +08:00
ZhangBiao 6870073129 【御剑行】排行完成 2021-10-13 15:39:47 +08:00
wangzhenxing 5b41289cd0 玉虚论道阵容界面修改 2021-10-13 15:26:12 +08:00
wangzhenxing 1ad72ca981 红点检测修改 2021-10-12 20:41:57 +08:00
wangzhenxing e9b740510f 红点修改 2021-10-12 20:21:54 +08:00
wangzhenxing 2237084155 Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-10-12 20:08:46 +08:00
wangzhenxing e28ca0087f 红点提交 2021-10-12 19:50:41 +08:00
jiaoyangna 1495f42672 好感度特效修改提交 2021-10-12 18:35:17 +08:00
wangzhenxing a1f3f67bed 我的队伍信息英雄下方序号修改 2021-10-12 18:28:46 +08:00
jiaoyangna 686d9345f4 长按赠送道具数量不变修改 2021-10-12 18:01:39 +08:00
jiaoyangna 25f3f927d6 位置修改提交 2021-10-12 17:51:04 +08:00
ZhangBiao 9604225256 【御剑行】可以完成循环_提交 2021-10-12 17:21:46 +08:00
jiaoyangna 134e52feeb 赠予抖动修改提交 2021-10-12 17:17:16 +08:00
jiaoyangna 0740005166 好感度位置修改提交 2021-10-12 17:09:58 +08:00
wangzhenxing 7a83198c6f 播放战斗对碰时添加按钮屏蔽 2021-10-12 16:39:58 +08:00
jiaoyangna 3f92309d78 好感度添加特效 2021-10-12 16:33:10 +08:00
wangzhenxing 89216b64a5 玉虚队伍战斗显示不一致修改 2021-10-12 16:13:19 +08:00
ZhangBiao 533bd25780 【御剑行】提交 2021-10-12 15:53:57 +08:00
jiaoyangna 262aa7a7e7 装备界面适配修改提交
(cherry picked from commit 45d29ef264)
(cherry picked from commit edfe797ddd)
2021-10-12 15:51:32 +08:00
wangzhenxing c4d7edc289 玉虚bug修改 2021-10-12 15:33:39 +08:00
jiaoyangna 60b53f2d7b 神将详情,装备修改提交 2021-10-12 15:32:07 +08:00
jiaoyangna e70329e605 神将详情显示错误修改 2021-10-12 14:54:12 +08:00
jiaoyangna e7cfacdccd 神奖详情界面修改提交 2021-10-12 14:26:19 +08:00