Commit Graph

2505 Commits (f960264667b7220b4238a94f926360e43ac4ce47)
 

Author SHA1 Message Date
ZhangBiao 05fee33df9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 15:05:29 +08:00
ZhangBiao 999ade9823 三界除魔 占个坑 2020-09-23 15:04:41 +08:00
ZhangBiao 772ae238ed Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-25 17:32:41 +08:00
ZhangBiao 7e099596d3 限时商市 其珍宝阁 多期机制增加 2020-09-25 16:42:25 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
jiaoyangna 48ac628ff1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 11:40:00 +08:00
jiaoyangna 543540cd26 【查看神将】切换查看的神将时,魂印图标显示不正确 2020-09-23 11:39:54 +08:00
gaoxin 8fcddf82c2 version文件修改 2020-09-23 10:58:08 +08:00
jiaoyangna e3a34ea941 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 18:38:42 +08:00
jiaoyangna a9389ec427 免费礼包修改 2020-09-22 18:38:22 +08:00
gaoxin 29d509d54a 回滚LayoutWrap文件 2020-09-22 17:05:41 +08:00
gaoxin 35a4c61b42 修复魂印图鉴界面销毁后再次打开报错的问题 2020-09-22 16:59:23 +08:00
jiaoyangna 1651407fa4 漏提 2020-09-14 05:08:53 +08:00
jiaoyangna db469f314c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 05:01:30 +08:00
zhangqiang e7918aa3dc 排行榜适配 2020-09-22 14:51:27 +08:00
jiaoyangna 64a4ab7818 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 14:43:27 +08:00
jiaoyangna 9771ac2838 漏提 2020-09-22 14:43:22 +08:00
zhangqiang 078906049f 巅峰战适配 2020-09-22 13:59:11 +08:00
jiaoyangna e5f3cd8e23 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 11:58:54 +08:00
jiaoyangna 2e1515daa4 青龙秘宝入口修改 2020-09-22 11:58:49 +08:00
jiaoyangna 1d64b76c5a 【破阵诛仙】点金达人任务,跳转点金,不计数 2020-09-22 11:57:00 +08:00
zhangqiang 7f0d2d4926 线上问题: 大闹天宫节点例会重叠 2020-09-22 11:39:05 +08:00
zhangqiang fd5358120e 线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改 2020-09-21 18:44:20 +08:00
zhangqiang fdd3398704 线上问题 : 一键编队上阵了归元后战力低的英雄 2020-09-21 18:03:44 +08:00
gaoxin 406426a6e0 修改tapdb设置服务器数据的调用位置 2020-09-21 12:11:26 +08:00
wangzhenxing d6f220623f 【ID1009487】
【圣物】ID10 战斗开始回血,没有表现
2020-09-21 10:07:30 +09:00
gongjiawei faa7671beb 音频更新 2020-09-18 14:00:29 +08:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
gongjiawei cfa0849704 音频更新 2020-09-18 11:49:36 +08:00
gongjiawei 96601c6f92 音频更新 2020-09-17 18:02:08 +08:00
gaoxin 2eeb4af779 修复切磋战斗结果只会显示失败的问题 2020-09-17 16:23:26 +08:00
gongjiawei 4e5c64264f 音频更新 2020-09-17 14:49:50 +08:00
zhangqiang d700e0da1c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-17 14:16:04 +08:00
ZhangBiao 4041b229cc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 12:22:19 +08:00
ZhangBiao e13026857d 限时兑换onhide function增加 2020-09-17 09:49:43 +08:00
zhangqiang cbdac88541 xuanyuan commit 2020-09-16 19:24:32 +08:00
zhangqiang b00d112660 xuanyaun commit 2020-09-16 18:54:48 +08:00
zhangqiang d423f61e4b 轩辕commit 2020-09-16 18:48:21 +08:00
zhangqiang 97b10ca124 打印 2020-09-16 18:36:41 +08:00
ZhangBiao e6b1832121 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 18:18:36 +08:00
ZhangBiao 6be45b4e89 幸运探宝增加动效 2020-09-16 18:18:07 +08:00
zhangqiang 99d05cb571 报错 编译c#代码提交 2020-09-16 18:08:40 +08:00
liujiaqi 04520e4a27 新宝物图标 2020-09-16 15:39:38 +08:00
wangxiaolong 293ac2b2f2 Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:45:28 +08:00
wangxiaolong 209ba84534 添加冗余代码调用 + 修改私有方法名称 2020-09-16 14:45:10 +08:00
wangxiaolong 9dbfd0b9d7 重新生成Generate 2020-09-16 14:44:38 +08:00
wangxiaolong 46d5904af0 添加冗余代码 2020-09-16 14:43:52 +08:00
ZhangBiao 60a335684d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:09:41 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
jiaoyangna 568d7c8ee2 万象境入口修改 2020-09-16 11:26:06 +08:00