Commit Graph

6644 Commits (1ad72ca981e026601b96f15ca9c85d46c58bbea5)

Author SHA1 Message Date
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
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
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
jiaoyangna 79e751197f 战力不一致修改提交 2021-10-12 13:20:24 +08:00
jiaoyangna b0f9b28036 神将详情报错修改提交 2021-10-12 12:17:33 +08:00
jiaoyangna 1a165839fd 点击神将详情界面查看属性按钮报错修改必现 2021-10-12 12:16:31 +08:00
wangzhenxing 1b2c8cc693 回方添加战斗力显示,解决青铜1升青铜2 进度条时间太长问题 2021-10-12 11:51:43 +08:00
wangzhenxing 4317d1df54 奖励显示修改 2021-10-12 10:27:49 +08:00
jiaoyangna fb0aec52e6 好感度优化 2021-10-12 10:05:10 +08:00
wangzhenxing 2f31f6c588 上阵界面排序修改 2021-10-12 10:03:20 +08:00
wangzhenxing d2c2b39b8b [战斗]==========被动312修改 2021-10-11 17:46:01 +08:00
wangzhenxing d8a0a0e8c1 玉虚提交 2021-10-11 16:30:33 +08:00
jiaoyangna 457b40b1e2 点击报错修改 2021-10-11 15:25:55 +08:00
jiaoyangna 4a338b9d4c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-11 15:15:50 +08:00
jiaoyangna 750f4afaef ID1010436】
【优化】好感度增加通用礼物 及界面优化
2021-10-11 15:15:34 +08:00
ZhangBiao 853933b0ea 【优化】服务器列表排序 2021-10-11 15:01:49 +08:00
jiaoyangna 4ff2e1dc8d 【ID1010436】
【优化】好感度增加通用礼物 及界面优化
2021-10-11 13:53:02 +08:00
jiaoyangna d9dce4e4ca 【ID1010436】
【优化】好感度增加通用礼物 及界面优化
2021-10-11 12:45:23 +08:00
jiaoyangna 5f15c8549e 【ID1010432】
【四灵试炼】编队界面的神将排序改为与心魔试炼相同
2021-10-11 11:33:55 +08:00
jiaoyangna 1269b5b114 【ID1010436】
【优化】好感度增加通用礼物 及界面优化
2021-10-11 11:31:03 +08:00
wangzhenxing 453216c6c7 【战斗】==========被动344修改 2021-10-09 18:23:45 +08:00
wangzhenxing 79addd132d [战斗]=========被动250 修改 2021-10-09 18:10:11 +08:00
wangzhenxing 4bd1047ccc [战斗]=====被动116 258 281 312 344修改 2021-10-09 17:13:24 +08:00
jiaoyangna ad690ffc38 去掉次数修改 2021-10-09 15:26:33 +08:00
jiaoyangna f4997e7a57 【ID1018706】
【巅峰赛】准备阶段一键上阵可以换人
2021-10-09 15:22:42 +08:00
jiaoyangna 4b7838584b 红点修改提交 2021-10-09 15:04:43 +08:00
jiaoyangna 89f66bc294 特权收益描述修改提交 2021-10-09 14:53:22 +08:00
jiaoyangna e3bb67c8a1 特权收益显示修改提交 2021-10-09 14:34:34 +08:00
jiaoyangna 7737449829 【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
2021-10-09 12:14:34 +08:00
jiaoyangna d58e38fcea 【ID1018684】
【好感度】好感度挂机加成没在挂机奖励预览处显示数量
2021-10-09 12:04:01 +08:00
jiaoyangna 32a38b6053 【ID1018679】
【好感度】礼物图标在背包没阵营标记
2021-10-09 11:39:09 +08:00
ZhangBiao 5d4dc1ab37 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-09 11:15:04 +08:00
ZhangBiao e8bfd73a9d 【织女】立绘不动修改 2021-10-09 11:14:24 +08:00
jiaoyangna e23d1259f1 ID1018689】
【好感度】好感度详情界面,好感等级进度,已达成的固定显示好感度
2021-10-09 11:09:53 +08:00
jiaoyangna 8b13f803c8 ID1018691】
【好感度】背包里所有5星好感度都满了,好感度入口还显示红点
2021-10-09 11:06:59 +08:00