Commit Graph

6389 Commits (5575ba2245a7192eb21d93ae994f5bf77bf48031)

Author SHA1 Message Date
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
wangzhenxing 81ace8ae2e 玉虚论道入口修改 2021-09-28 17:29:33 +08:00
jiaoyangna d7dc0425cb 玲珑宝镜修改提交 2021-09-28 17:22:00 +08:00
wangzhenxing d45abf6fcf Merge branch 'china/dev' into 0功能/玉虚论道 2021-09-28 15:54:33 +08:00
wangzhenxing ae3efee379 提交修改 2021-09-28 15:50:09 +08:00
jiaoyangna 26832c2350 去掉log 2021-09-28 13:43:23 +08:00
jiaoyangna d9162dbbe3 选中框修改提交 2021-09-28 13:39:24 +08:00
wangzhenxing f580f14a44 段位特效修改提交 2021-09-28 11:51:20 +08:00
jiaoyangna 5d9b93ca57 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-28 11:31:00 +08:00
jiaoyangna 46731f726f 玲珑宝镜修改提交 2021-09-28 11:30:44 +08:00
ZhangBiao 77eccdd8b7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-28 11:24:04 +08:00
ZhangBiao 8ec75376da 【限时召唤】报错修改 2021-09-28 11:23:50 +08:00
gaoxin 4d4e8cf55e 【副本战斗】战斗结算时报错 2021-09-28 11:20:42 +08:00
ZhangBiao 422806200e 【御剑行】提交 2021-09-28 10:34:05 +08:00
wangzhenxing e42540ade8 排行榜修改提交 2021-09-28 10:29:33 +08:00
jiaoyangna b0c02a7ff0 修改道具排序顺序 2021-09-28 10:12:12 +08:00
jiaoyangna 33acb35f82 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-09-28 09:52:22 +08:00
jiaoyangna 92294c6239 赠送之后立绘动作修改 2021-09-28 09:47:56 +08:00
jiaoyangna e54fc2faa9 去掉左右切换按钮 2021-09-27 21:43:04 +08:00
jiaoyangna ba7421ffa7 添加点击神将的互动 2021-09-27 21:39:43 +08:00
jiaoyangna 6de82cb731 好感度tips 提交 2021-09-27 21:35:55 +08:00
jiaoyangna 6e3dbffb64 报错修改 2021-09-27 20:33:45 +08:00
jiaoyangna 2e2a0d6edd 桃心位置修改 2021-09-27 20:26:45 +08:00
gaoxin 94782f7cf4 【ID1018635】 【唯一限制魂印】同时戴舍身济世和历战之躯,恭送掉该神将数据只会清一个,另一个依然是无法佩戴 2021-09-27 20:18:10 +08:00
jiaoyangna 75049d619c 好感度位置修改 2021-09-27 20:07:55 +08:00
jiaoyangna af63daaeaf 好感度到达最大值修改 2021-09-27 19:20:29 +08:00
gaoxin ed3f38f9cb 【战斗力】修复部分数据刷新不及时 2021-09-27 18:33:58 +08:00
ZhangBiao a67e3226ce 【寻宝迷踪】走到指定地点,返回,再进入挖宝图标亮起 2021-09-27 17:52:24 +08:00
ZhangBiao 1fd9f8a004 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:46:53 +08:00
jiaoyangna ad35e1646c 特权显示修改 2021-09-27 17:46:43 +08:00
ZhangBiao a8c9c836a9 【排行榜】膜拜转圈儿修复 2021-09-27 17:46:40 +08:00
gaoxin a2cd31dbd2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:35:48 +08:00
gaoxin eacf753e55 【战斗力】修复部分设置人物属性全部为脏数据时没有设置战斗力脏数据 2021-09-27 17:35:36 +08:00
wangzhenxing 1a808dfd54 [战斗]============被动137修改 添加查找没有触发不灭的技能目标 2021-09-27 17:33:51 +08:00
jiaoyangna ea52d01112 好感度新手引导修改提交 2021-09-27 17:26:35 +08:00
gaoxin f929826eba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:15:42 +08:00
gaoxin 07a96a88e4 【轩辕宝镜】修复只上阵了满足条件的神将,没有补位的问题 2021-09-27 17:13:48 +08:00
ZhangBiao a4ee19a351 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 17:02:59 +08:00
ZhangBiao 5939c5b2f8 【七界试炼】跳转提交 2021-09-27 17:02:43 +08:00
gaoxin c8c003abb7 【无尽副本】修复编队无法保存的问题 2021-09-27 16:58:08 +08:00
gaoxin 38f41e7517 【战斗】修复无尽副本战斗结束后报错 2021-09-27 16:57:40 +08:00
jiaoyangna c778c334e5 添加道具属性显示 2021-09-27 16:49:25 +08:00
jiaoyangna 644d8e3790 长按短按效果添加 2021-09-27 16:43:01 +08:00
jiaoyangna 9276097bf4 神将不能拖动修改 2021-09-27 16:27:58 +08:00
wangzhenxing 70ebab2fe1 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
yuanshuai f16bb7ed8e 【四象心法】长按强化bug修改 2021-09-27 15:57:36 +08:00
jiaoyangna 8aeb4f2416 添加逍遥游跳转 2021-09-27 15:50:25 +08:00
jiaoyangna 1d1e21a9e7 属性格式修改提交 2021-09-27 15:45:23 +08:00
gaoxin 0233ff87e7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:36:00 +08:00
gaoxin 34ade2489d 【无尽副本】修复报错 2021-09-27 15:35:48 +08:00
ZhangBiao 6bc25cd08c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 15:33:52 +08:00
ZhangBiao e4250d3fac 【七界试炼】红点不再请求数据 2021-09-27 15:33:30 +08:00
gaoxin 6c50cdfd09 【无尽副本】修复无尽副本编队没有人得问题 2021-09-27 14:57:27 +08:00
ZhangBiao 810614f226 【四象心法】增加跳转
(cherry picked from commit 98d3911f23)
2021-09-27 14:37:20 +08:00
ZhangBiao 98d3911f23 【四象心法】增加跳转 2021-09-27 14:32:59 +08:00
jiaoyangna 9137d9f592 新手引导调整 2021-09-27 14:22:23 +08:00
wangzhenxing 433ae25590 [战斗]======被动351 353 修改 2021-09-27 13:47:27 +08:00
ZhangBiao 90d9530b2b 【乾坤宝盒】报错修改 2021-09-27 11:46:17 +08:00
jiaoyangna fb2bcaff48 好感度增加返回提示 2021-09-27 11:22:17 +08:00
jiaoyangna 4e17b829ba 红点修改提交,挂机界面预览修改提交 2021-09-27 10:58:41 +08:00
jiaoyangna d4e3a3294c 引导修改提交 2021-09-27 10:41:32 +08:00
ZhangBiao cdd6499fe8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-27 10:34:19 +08:00
ZhangBiao 0842438fdf 【装备分解】不可分解白金装备and增加mask点击 2021-09-27 10:34:03 +08:00
jiaoyangna 683e71ae89 好感度入口调整 2021-09-27 09:45:57 +08:00
jiaoyangna 13428bc854 神将排序修改 2021-09-26 21:49:05 +08:00
jiaoyangna a0778d0173 新手引导修改 2021-09-26 21:46:01 +08:00
jiaoyangna 3a5e3cf17e 好感度提交 2021-09-26 21:32:04 +08:00
gaoxin ace42823db 【战斗】被动353,修复溢出的伤害无法被无敌盾抵消的问题 2021-09-26 20:48:32 +08:00
gaoxin 2bce8547c7 【战斗】被动353直接伤害击杀目标溢出伤害的[a]%将对生命百分比[b]的目标造成伤害 2021-09-26 20:31:51 +08:00
jiaoyangna d39ef472dc 好感度提交 2021-09-26 20:23:08 +08:00
wangzhenxing 3ff3649284 【功能】======白金装备合成 最少显示信息修改 2021-09-26 20:03:14 +08:00
wangzhenxing 306ab999b9 [功能]=============白金装备合成红点修改 2021-09-26 19:47:18 +08:00
gaoxin f282fe046b 【白金装备】修改白金装备字体显示 2021-09-26 18:41:47 +08:00
gaoxin 54afaef65a 【GM】一键顶级装备红色一星装备生成错误 2021-09-26 17:43:38 +08:00
gaoxin e318ca197f 【GM】一键顶级装备,增加白金装备 2021-09-26 17:40:48 +08:00
ZhangBiao a565d94658 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
gaoxin 8310c29aaf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:38:39 +08:00
gaoxin b21e7efe0d 【角色信息】修复跳转到角色信息界面,点击左右箭头报错 2021-09-26 17:38:23 +08:00
wangzhenxing e763b6472b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 17:31:16 +08:00
wangzhenxing a3e1782007 【功能】==========白金装备合成提交 2021-09-26 17:30:35 +08:00
gaoxin e61dea0f4a 【白金装备】套装显示添加 2021-09-26 17:13:12 +08:00
jiaoyangna d7276eae64 战力修改提交 2021-09-26 15:23:33 +08:00
gaoxin e671673389 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-26 15:02:49 +08:00
gaoxin 59311a8d88 【跨服】算错了跨服前七天的事件 2021-09-26 15:02:33 +08:00
wangzhenxing 221939e1ec [战斗]==========御甲条显示修改 2021-09-26 14:56:07 +08:00
jiaoyangna 330b36b55a 好感度等级修改 2021-09-26 14:21:22 +08:00
jiaoyangna e59f160387 好感度等级修改提交 2021-09-26 13:55:57 +08:00
gaoxin 6a71a972e9 【战斗力】关闭一些log 2021-09-26 11:18:38 +08:00
jiaoyangna 14b967185b 好感度提交 2021-09-26 10:18:51 +08:00
ZhangBiao 59e51aefef 【七界试炼】提交 2021-09-26 10:08:15 +08:00
ZhangBiao 8f9743d127 【七界试炼】激活遗物提示,奖励遮盖 2021-09-26 10:01:37 +08:00
jiaoyangna 1152586ff1 好感度提交 2021-09-26 09:54:58 +08:00
ZhangBiao bac86d5ec8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 19:23:43 +08:00
ZhangBiao 1a866b1068 【七界试炼】提交 2021-09-24 19:23:30 +08:00
gaoxin 8c76d476a2 【编队】修复保存编队接口名修改导致的报错 2021-09-24 17:49:32 +08:00
wangzhenxing d83cf97ae2 【战斗】==========被动93 307 309 351修改 2021-09-24 17:40:08 +08:00
ZhangBiao 1505647241 【七界试炼】框位不齐 2021-09-24 17:02:38 +08:00
ZhangBiao 35091621dc 【七界试炼】提交 2021-09-24 16:52:05 +08:00
ZhangBiao a823984187 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-24 16:47:19 +08:00
ZhangBiao 028f97c195 【七界试炼】红点和跳转i需改 2021-09-24 16:47:06 +08:00
yuanshuai 77a47432bf 【四象心法】强化按钮点击强化两次bug修改 2021-09-24 15:59:01 +08:00