Commit Graph

12299 Commits (20dc705f0ac733d5457904d14257e99bcd853cf8)
 

Author SHA1 Message Date
jiaoyangna 1905b3c175 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-21 18:37:18 +08:00
jiaoyangna 3ccf3c29a3 ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-21 18:36:21 +08:00
wangzhenxing 51e89fea29 英雄觉醒后天赋显示修改 2022-02-21 14:25:52 +08:00
gaoxin 096d0d0dc4 【无尽副本】编队列表加入神将版本判断 2022-03-02 13:42:48 +08:00
gaoxin 84f21cbd9b 【推荐阵容】加入神将版本判断 2022-03-02 13:28:07 +08:00
张彪 9345c31d8b 【战力冲刺】提交 2022-02-21 10:40:27 +08:00
张彪 6044ee2828 【战力冲刺】图标提交 2022-02-18 18:11:18 +08:00
张彪 b51c7b7780 【战力冲刺】提交 2022-02-18 17:02:27 +08:00
张彪 05b9c3afa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 16:28:02 +08:00
张彪 4ca27d13ad 【战力冲刺】提交 2022-02-18 16:27:49 +08:00
wangzhenxing 92f3dee3ab 【战斗】==========被动226 423 424修改添加提交 2022-02-18 16:26:33 +08:00
jiaoyangna ca4651a55b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:33:24 +08:00
jiaoyangna 70cc76deb4 恭送神将排序修改提交 2022-02-18 15:32:42 +08:00
jiaoyangna fbb86f7263 恭送神将排序修改提交 2022-02-18 15:31:50 +08:00
张彪 c30ab105cc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:19:46 +08:00
张彪 fe6547358c 【灵兽宝阁】珍奇宝阁提交 2022-02-18 15:19:37 +08:00
jiaoyangna bfd2ff46a7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:18:09 +08:00
jiaoyangna 2986b3964a 魂印图鉴修改提交 2022-02-18 15:17:28 +08:00
张彪 3aa934a95e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:14:33 +08:00
张彪 51196cf150 【灵兽宝阁】新增几档灵兽特惠礼包界面提交 2022-02-18 15:14:25 +08:00
jiaoyangna 42a60c158f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-18 15:09:25 +08:00
jiaoyangna 1bd0fe5562 魂印修改提交 2022-02-18 15:08:45 +08:00
张彪 7083b34f51 【战力冲刺】提交 2022-02-18 14:05:59 +08:00
张彪 f9fca9ca93 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-17 17:14:46 +08:00
张彪 a6d0a4f7f0 【战力冲刺】提交 2022-02-17 17:14:33 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
jiaoyangna a76616df31 【ID1011149】
【优化】升星操作增加鸿蒙阵等级限制
2022-02-17 15:13:26 +08:00
wangzhenxing d03215cc16 [资源]========神菩提提交
(cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e)
2022-02-17 10:40:12 +08:00
jiaoyangna 620a859c09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-16 14:28:25 +08:00
gaoxin 0933331d4a 【神将】加入版本控制时间计算错误修改 2022-02-24 16:50:36 +08:00
gaoxin bfbc3b7195 【拍脸】寻仙招募界面显示错误修改 2022-02-24 16:49:19 +08:00
gaoxin 545e06c474 Merge branch '0功能/寻仙招募拍脸' into china/dev 2022-02-24 15:57:18 +08:00
gaoxin 63343f88c7 【拍脸】寻仙招募拍脸跳转添加引导小手 2022-02-24 15:56:53 +08:00
gaoxin 2342bd8af8 【拍脸】寻仙招募拍脸添加 2022-02-23 18:08:50 +08:00
jiaoyangna 22f070e13b 资源提交 2022-02-16 14:28:08 +08:00
wangzhenxing 5b3c82f0b3 【bug】=======图鉴觉醒信息显示修改 2022-02-15 10:43:13 +08:00
jiaoyangna 7538eea1a5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-15 10:36:22 +08:00
gaoxin 5cf3527762 【资源】特惠商城资源替换 2022-02-23 18:37:50 +08:00
gaoxin 67c855ad56 【资源】特惠商城资源替换 2022-02-23 18:36:30 +08:00
jiaoyangna 4ea5d98b31 每日豪礼修改提交 2022-02-15 10:36:08 +08:00
gaoxin f9f34a9d46 【天书密卷】加入神将是否进入版本判断 2022-02-11 17:07:07 +08:00
wangzhenxing 3fde93fcd7 【战斗】=========效果108修改 2022-02-11 16:27:27 +08:00
gaoxin c2b4647418 【限时Up】加入神将版本判断 2022-02-11 16:22:44 +08:00
gaoxin 0ec5cf102a 【心愿】判断神将是否加入版本 2022-02-11 16:11:58 +08:00
gaoxin 2b413264fd 【头像】加入英雄是否进入版本判断-删除log 2022-02-11 16:06:38 +08:00
gaoxin a2ee17f6c3 【头像】加入英雄是否进入版本判断 2022-02-11 16:05:51 +08:00
jiaoyangna 7a010e5e7d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-11 15:58:16 +08:00
jiaoyangna e27c51ee93 超值返利提交 2022-02-11 15:57:58 +08:00
张彪 e82c6693e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-02-11 15:54:11 +08:00
张彪 d56afde090 【每日特惠】注释代码 2022-02-11 15:54:03 +08:00