Commit Graph

2256 Commits (f0f84d841c2dbae54934c86952dfcae82c24d16b)
 

Author SHA1 Message Date
seanlong f0f84d841c 修改generate 2020-09-09 09:46:44 +08:00
jiaoyangna d84b25c7a6 限时召唤提交 2020-09-10 09:33:27 +08:00
jiaoyangna e69cdaebfa 资源提交 2020-09-08 18:06:24 +08:00
jiaoyangna 70df47683a 限时召唤提交 2020-09-08 17:56:49 +08:00
jiaoyangna ea62094ac2 图片提交 2020-09-08 17:52:47 +08:00
ZhangBiao d36bd93b2d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 17:33:56 +08:00
ZhangBiao f56be71560 主题活动修改 2020-09-08 17:16:08 +08:00
jiaoyangna fb9b646553 限时召唤提交 2020-09-08 16:57:19 +08:00
gaoxin 37316136f1 剧情添加转场效果 2020-09-08 15:31:38 +08:00
gongjiawei 4cf966d5b2 音频更新 2020-09-08 14:04:10 +08:00
zhangqiang f6abc4a22e 公会副本倒计时结束 加成buff 重置 2020-09-08 12:01:05 +08:00
gaoxin b65581fe71 引导战斗添加 2020-09-08 11:58:34 +08:00
ZhangBiao f451ac76f5 2020-09-08 10:56:23 +08:00
ZhangBiao 7a375b767c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 10:32:58 +08:00
ZhangBiao c67d731374 天宫秘宝增加购买校验 2020-09-08 10:32:49 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
jiaoyangna 6ac2b5a5f9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 09:32:45 +08:00
gaoxin 32b8705ab1 引导战斗流程添加 2020-09-07 18:25:31 +08:00
gaoxin c0d6feeb8d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 17:06:56 +08:00
gaoxin 0c95879fb9 修改新手引导剧情开始节点 2020-09-07 17:06:45 +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 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
altair bf38fd1ab6 修改技能图片 2020-09-07 11:54:03 +08:00
jiaoyangna a15206e938 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 10:01:13 +08:00
jiaoyangna 5e3e27c056 预设添加动画代码提交 2020-09-07 10:01:08 +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