Commit Graph

2240 Commits (701db5bb17d45cb86cb54713e7a7d91ca50bf09f)
 

Author SHA1 Message Date
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
JieLing d440edea11 打开兑换码功能 2020-09-09 20:12:11 +08:00
zhangqiang 0107f15145 Merge branch 'master_develop' into master_tishen_hw 2020-09-07 15:41:41 +08:00
zhangqiang fbb558b44c 巅峰赛战斗结束界面适配 2020-09-07 15:40:19 +08:00
zhangqiang 604de656df 巅峰赛战斗结束界面适配 2020-09-07 15:39:57 +08:00
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang c3ce1c8c31 巅峰赛详情适配 2020-09-07 15:03:16 +08:00
zhangqiang 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
zhangqiang 7ecb24676f 代码漏提 2020-09-07 14:24:13 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
altair bf38fd1ab6 修改技能图片 2020-09-07 11:54:03 +08:00
JieLing 0a36bdf397 Merge branch 'master_develop' into master_tishen_hw 2020-09-05 20:41:56 +08:00
gaoxin b62fe63c84 关闭战斗log 2020-09-05 20:40:33 +08:00
JieLing 547bd8ead2 Merge branch 'master_develop' into master_tishen_hw 2020-09-05 20:07:20 +08:00
gaoxin f9350d662f 分辨率小于1080*1920的背景统一放大1.2倍 2020-09-05 20:05:50 +08:00
JieLing 007487ed91 Merge branch 'master_develop' into master_tishen_hw 2020-09-05 19:06:31 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +08:00
JieLing 50b0a8ffbf Merge branch 'master_develop' into master_tishen_hw 2020-09-05 17:25:25 +08:00
gaoxin 4ca09780a0 引导添加检测类型 2020-09-05 17:24:46 +08:00
gaoxin d4e3d2b8f9 测试服包版本修改 2020-09-05 17:24:09 +08:00
JieLing f004792b1a Merge branch 'master_develop' into master_tishen_hw 2020-09-05 17:21:57 +08:00
gaoxin 7afe25a5d2 界面适配修改,引导添加网络延时检测 2020-09-05 17:21:09 +08:00
JieLing 114fa10510 Merge branch 'master_develop' into master_tishen_hw 2020-09-05 17:04:20 +08:00
gaoxin 338b7b4375 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-05 16:44:07 +08:00
gaoxin 3103a4122b 设置,几天好礼界面内容修改 2020-09-05 16:43:53 +08:00
zhangqiang f8508a8663 shipei 2020-09-05 16:43:25 +08:00
gaoxin 68c9726917 屏幕适配修改 2020-09-05 16:39:10 +08:00
zhangqiang 21e7bf2e80 shi pei 2020-09-05 16:28:52 +08:00
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +08:00
zhangqiang 0d82f376b0 shi pei 2020-09-05 15:28:44 +08:00
gaoxin 37f2fd9bdf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-05 15:21:55 +08:00
gaoxin d05b5d43f1 android p 以上机型屏幕适配添加 2020-09-05 15:21:41 +08:00
zhangqiang c35058767b shi pei 2020-09-05 15:20:30 +08:00
zhangqiang 96e795c7c5 全屏界面 背景图片适配脚本 自行挂载 2020-09-05 14:22:53 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
gaoxin 92a8b93b50 修改屏幕的适配方式,修改计算屏幕位置的方法 2020-09-05 12:15:58 +08:00
JieLing 32036504fb Merge branch 'master_develop' into master_tishen_hw 2020-09-04 18:42:45 +08:00
zhangqiang 9937727ede Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 18:35:40 +08:00
zhangqiang 6b55198f12 周月礼包替图 2020-09-04 18:35:30 +08:00
liujiaqi ad36cb524b 宝物资源 2020-09-04 18:13:23 +08:00
ZhangBiao aec554c002 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 18:06:49 +08:00
ZhangBiao f6fde7a2c8 试炼副本增加动效 2020-09-04 18:04:54 +08:00
zhangqiang cbad6e10cd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:51:05 +08:00
zhangqiang bbd5d3bda2 成长基金 2020-09-04 17:50:50 +08:00
ZhangBiao 4b50f8408b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:46:35 +08:00
ZhangBiao 63cde2092d 无尽副本界面动效增加 2020-09-04 17:46:27 +08:00
gongjiawei 69a4bc320d 音频更新 2020-09-04 17:44:39 +08:00
zhangqiang f6a3178926 xiugai 2020-09-04 17:34:59 +08:00
ZhangBiao 606ecfe6b2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:33:53 +08:00