Commit Graph

9570 Commits (018c09d69cd8e34f673f3dc16c97fa1188898b1e)
 

Author SHA1 Message Date
ZhangBiao 018c09d69c 【御剑行】竞猜,差一个三级弹窗 2021-10-13 17:30:26 +08:00
ZhangBiao 6870073129 【御剑行】排行完成 2021-10-13 15:39:47 +08:00
ZhangBiao 9604225256 【御剑行】可以完成循环_提交 2021-10-12 17:21:46 +08:00
ZhangBiao 533bd25780 【御剑行】提交 2021-10-12 15:53:57 +08:00
ZhangBiao 359ca6b299 【御剑行】提交 2021-10-12 11:26:48 +08:00
ZhangBiao 99d80454f5 【御剑行】增加开始动画 2021-10-11 17:25:48 +08:00
ZhangBiao 294147b9ba 【御剑行】提交 2021-10-11 14:37:33 +08:00
ZhangBiao a0911448b2 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-09 18:18:32 +08:00
ZhangBiao 110a6d64c0 【御剑行】导入资源,剑 2021-10-09 18:17:59 +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
liujiaqi 24c77a0d7e 【资源】杨戬音频 2021-10-09 16:39:45 +08:00
ZhangBiao 895916a53a 【御剑行】提交 2021-10-09 16:24:34 +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 173bec2de7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-09 14:34:52 +08:00
jiaoyangna e3bb67c8a1 特权收益显示修改提交 2021-10-09 14:34:34 +08:00
ZhangBiao f1e5f69614 【御剑行】提交 2021-10-09 14:33:09 +08:00
wangzhenxing cdd9f0a524 [战斗]====破盾状态字图片替换修改 2021-10-09 14:17:35 +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
jiaoyangna a2cced9272 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-09 11:25:22 +08:00
jiaoyangna 57304e0dc3 ID1018685】
【好感度】挂机预览加成心形图标左右不居中,特权图标上下不居中
【ID1018687】
【好感度】赠与界面,神将名字不居中
2021-10-09 11:24:39 +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
ZhangBiao f2b5f62ddd Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_negw_skin01_02.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-10-09 11:00:18 +08:00
ZhangBiao 09bb4fc688 【御剑行】可以读取剧本移动了 2021-10-09 10:56:49 +08:00
jiaoyangna 845373e12d 好感度长按修改提交 2021-10-09 10:53:32 +08:00
ZhangBiao 21bdecb465 【御剑行】提交 2021-10-08 20:49:25 +08:00
jiaoyangna c72d3af853 【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
2021-10-08 19:32:16 +08:00
jiaoyangna 937096d445 【ID1018697】
【佩戴魂印】本地dev佩戴魂印没有战力上升提示了
2021-10-08 19:17:59 +08:00
jiaoyangna 7b88415339 好感度优化提交 2021-10-08 18:53:06 +08:00
ZhangBiao 81a3db0446 【御剑行】提交 2021-10-08 15:45:28 +08:00
jiaoyangna 6700723aaa 好感度0级挂机收益显示错误修改 2021-10-08 14:31:28 +08:00
jiaoyangna ce39857111 杨戬新资源修改提交 2021-10-08 14:18:31 +08:00
jiaoyangna 8d91a6d875 协议提交 2021-10-08 13:09:13 +08:00
jiaoyangna 491c04b2a3 装备套装属性预设修改提交 2021-10-08 12:14:48 +08:00
jiaoyangna 14008964fc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-08 11:55:25 +08:00
jiaoyangna f449016952 添加容错 2021-10-08 11:55:01 +08:00
ZhangBiao 878f0410ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-08 11:54:09 +08:00
ZhangBiao eb816dcc89 【七界试炼】修复无法取消激活 2021-10-08 11:53:54 +08:00
jiaoyangna e019ef8f22 【ID1010392】
点石成金基础收益随着玩家等级提升
2021-10-08 11:51:37 +08:00
jiaoyangna 8de35750c6 【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
2021-10-08 11:34:48 +08:00
gaoxin 2dbb544a46 【登录】登录接口编号增加 2021-09-30 15:19:10 +08:00
gaoxin 2eb04261bc Merge branch '0优化/装备对比' into china/dev 2021-09-30 15:01:40 +08:00