Commit Graph

6389 Commits (5575ba2245a7192eb21d93ae994f5bf77bf48031)

Author SHA1 Message Date
ZhangBiao decf1b869c 【御剑行】提交 2021-10-15 14:47:14 +08:00
jiaoyangna e026881024 ID1010484】
易经宝库可选奖励优化
2021-10-15 14:35:57 +08:00
ZhangBiao e43abf17b2 【御剑行】提交 2021-10-15 14:14:04 +08:00
ZhangBiao a16b8c5e75 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-15 14:06:35 +08:00
ZhangBiao cbef4e021b 【御剑行】提交 2021-10-15 14:02:33 +08:00
ZhangBiao 132dc11c6b 【御剑行】提交 2021-10-15 13:33:58 +08:00
jiaoyangna 234c17cfe4 挂机奖励预览四舍五入显示
(cherry picked from commit 09ef1c8981)
2021-10-15 12:13:47 +08:00
jiaoyangna 3e616a0462 排行榜上小人方向修改
(cherry picked from commit f31f62ec09)
2021-10-15 12:13:28 +08:00
jiaoyangna 83ceaa43b7 排行榜上小人朝侧面修改提交
(cherry picked from commit 851bd2450c)
2021-10-15 12:13:14 +08:00
jiaoyangna 09ef1c8981 挂机奖励预览四舍五入显示 2021-10-15 12:12:38 +08:00
jiaoyangna f31f62ec09 排行榜上小人方向修改 2021-10-15 11:51:38 +08:00
jiaoyangna 851bd2450c 排行榜上小人朝侧面修改提交 2021-10-15 11:40:01 +08:00
ZhangBiao 35eb36384e 【御剑行】提交 2021-10-15 11:15:42 +08:00
jiaoyangna 450d426232 Merge branch 'china/dev' into 0功能/玉虚论道 2021-10-15 10:05:22 +08:00
wangzhenxing 474549ea24 bug修改 2021-10-14 21:36:29 +08:00
wangzhenxing 444f8259ee 玉虚论道主界面请求添加类型 2021-10-14 21:30:35 +08:00
jiaoyangna f852ba73ed 长按赠完礼物时多提示一次礼物数量不足 2021-10-14 20:39:37 +08:00
jiaoyangna 101f406a4c 【ID1010469】
好感度优化
2021-10-14 20:15:53 +08:00
ZhangBiao 2fda9c77ff 【御剑行】提交 2021-10-14 19:57:40 +08:00
ZhangBiao 4d911a4ea4 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-14 18:28:55 +08:00
ZhangBiao 6ebe5720a6 【御剑行】红点提交 2021-10-14 18:28:27 +08:00
ZhangBiao 46d38b01ec 【御剑行】提交 2021-10-14 18:02:30 +08:00
jiaoyangna 3b5772be75 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-14 17:15:53 +08:00
jiaoyangna 9e46ffd910 神将天赋界面修改提交 2021-10-14 17:14:51 +08:00
wangzhenxing fbb1c387c7 【战斗】=======伤害公式 修改 去点 防御0.5的容错 2021-10-14 17:12:01 +08:00
ZhangBiao cd04fc3d37 Merge branch 'china/dev' into 0活动开发聚集地/御剑行 2021-10-14 17:11:12 +08:00
ZhangBiao 4b6079d4e8 【御剑行】提价 2021-10-14 17:10:40 +08:00
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 ac0221b89f 白金装备修改提交 2021-10-14 15:05:36 +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 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
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
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
ZhangBiao 359ca6b299 【御剑行】提交 2021-10-12 11:26:48 +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
ZhangBiao 99d80454f5 【御剑行】增加开始动画 2021-10-11 17:25:48 +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
ZhangBiao 294147b9ba 【御剑行】提交 2021-10-11 14:37:33 +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
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
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 e3bb67c8a1 特权收益显示修改提交 2021-10-09 14:34:34 +08:00
ZhangBiao f1e5f69614 【御剑行】提交 2021-10-09 14:33:09 +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
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 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
wangzhenxing 36d542ba9d 玉虚论道优化提交 2021-09-30 15:12:02 +08:00
gaoxin 2eb04261bc Merge branch '0优化/装备对比' into china/dev 2021-09-30 15:01:40 +08:00
gaoxin 4d907f1530 【装备界面优化】移除替换装备和宝物时上方的当前装备/宝物信息 2021-09-30 15:01:19 +08:00
jiaoyangna 6ebea4784d 好感度报错修改 2021-09-30 11:37:24 +08:00
wangzhenxing 31e8594a70 [战斗]=========御甲添加 图片字提示表现 2021-09-30 09:53:31 +08:00
ZhangBiao 660a88b965 【御剑行】提交 2021-09-29 18:34:54 +08:00
jiaoyangna b88bfef04f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 18:23:26 +08:00
jiaoyangna b44c4af217 好感度0点次数刷新修改 2021-09-29 18:23:13 +08:00
gaoxin 73709000a9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 17:34:38 +08:00
gaoxin 971a457224 【战斗力】修复计算在编队上的人物临时数据时未计算编队相关属性的问题 2021-09-29 17:34:20 +08:00
jiaoyangna 8abe248a24 逍遥游奖励界面修改提交 2021-09-29 16:21:24 +08:00
jiaoyangna 4dfdc507f7 绿色修改提交 2021-09-29 16:19:29 +08:00
jiaoyangna a62e656d7b Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-29 15:49:39 +08:00
gaoxin 0abe5663c6 【战斗力】debug时不再计算老版本的战斗力 2021-09-29 14:55:14 +08:00
jiaoyangna ee096187ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-29 14:35:15 +08:00
jiaoyangna f2273e427c 逍遥游改表代码修改提交 2021-09-29 14:34:59 +08:00
gaoxin 2352144ead 【四灵试炼】助战神将报错 2021-09-29 09:19:53 +08:00
gaoxin b1dff6a023 【四灵试炼】修复计算助战神将战斗力报错 2021-09-29 08:33:09 +08:00
gaoxin 8692e6cec9 【四灵试炼】修复计算助战神将战斗力报错 2021-09-29 08:32:40 +08:00
gaoxin 788d18e332 【装备对比】背包中的装备信息界面修改 2021-09-28 21:00:50 +08:00
gaoxin e56affc4b4 【装备对比】装备穿戴界面显示修改 2021-09-28 19:45:21 +08:00
jiaoyangna c242b86dd2 好感度详情提交 2021-09-28 18:23:37 +08:00
ZhangBiao fa1c5a5dee 【御剑行】提交 2021-09-28 17:48:28 +08:00
jiaoyangna b6a9cbc1c1 进度条修改提交
(cherry picked from commit 592845bf98)
2021-09-28 17:41:47 +08:00