Commit Graph

232 Commits (508b6c284f875d07e9a09d8f5f13a809ea950c5c)

Author SHA1 Message Date
ZhangBiao f1ab5780e4 切换界面黑屏问题解决 2020-07-22 14:34:00 +08:00
ZhangBiao 176ab5f359 2020-07-22 10:51:36 +08:00
ZhangBiao 934b6e8bb0 新章节未开启,奖励与地图已经更改问题修改 2020-07-21 20:20:39 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00
ZhangBiao a07830ea52 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:36:54 +08:00
ZhangBiao 9f9f430976 道具标签不对应修改 2020-07-21 14:36:15 +08:00
jiaoyangna 49d65fe9db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:16:46 +08:00
jiaoyangna 9fbcc3b77b 【神将】升星,需要四个三星同阵营不应该自动给选择上 2020-07-21 14:16:40 +08:00
gaoxin 528243e0ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:09:52 +08:00
ZhangBiao 3503afa84b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 12:01:53 +08:00
ZhangBiao 8ca0ecab40 2020-07-21 12:01:46 +08:00
gaoxin 0992012713 Merge branch 'master_test' into master_develop 2020-07-21 11:40:13 +08:00
gaoxin 0db4c93ef7 修复登录界面登出事件无法触发的问题 2020-07-21 11:31:26 +08:00
jiaoyangna aa86f77fea 【充值】表里配的5级,实际创角就有入口 2020-07-21 11:31:05 +08:00
ZhangBiao d3caa3d4cf 森罗调整 2020-07-21 10:30:25 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
gaoxin 02b37b2d67 Merge branch 'master_develop' into master_test 2020-07-20 19:58:43 +08:00
gaoxin 42a2496ef7 修复sdk支付时界面不刷新的问题, 2020-07-20 19:57:49 +08:00
ZhangBiao 857d32bb96 升级礼包 剩余时间文字修改 2020-07-20 16:56:28 +08:00
ZhangBiao 4a696f3ec0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 16:42:37 +08:00
ZhangBiao 054f1558bc bug修复 2020-07-20 16:42:20 +08:00
zhangqiang f24e7cbef3 排行榜请求修改 2020-07-20 16:38:26 +08:00
zhangqiang f234c1a174 竞技场中文字修改 2020-07-20 16:07:30 +08:00
zhangqiang 99f885ac22 竞技场宝箱奖励位置可配 2020-07-20 16:01:16 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
zhangqiang c471a9ccd5 竞技场替换宝箱效果图替换 2020-07-20 11:28:19 +08:00
ZhangBiao 97bfdd53b6 十绝阵开启阶段加入公会不可挑战十绝阵 2020-07-20 11:21:16 +08:00
ZhangBiao 43f7ca10bc 2020-07-20 11:02:40 +08:00
ZhangBiao f9ecb13bd3 战斗跳过按钮 2020-07-20 10:40:55 +08:00
ZhangBiao 055c5f6926 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 10:02:21 +08:00
ZhangBiao c0d053c65c 免费抽刷新时间 2020-07-20 10:02:12 +08:00
gaoxin 5c962f330a Merge branch '接入SDK' into master_test
# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset
2020-07-18 19:55:02 +08:00
gaoxin 90e9548549 ext字段修改 2020-07-18 19:48:39 +08:00
gaoxin a1acdd13fb 支付接口接入,打点数据完善 2020-07-18 19:24:19 +08:00
zhangqiang c6b5321424 bug 2020-07-17 20:52:44 +08:00
zhangqiang 480e810478 添加文字 2020-07-17 20:06:48 +08:00
jiaoyangna 9876ec5f5a 红点检测修改 2020-07-17 18:20:31 +08:00
jiaoyangna b56682cafd 5点刷新添加一个特权id 2020-07-17 18:04:37 +08:00
gaoxin b099f0e251 数据打点静态数据添加 2020-07-17 17:50:05 +08:00
jiaoyangna 3f576bbf3e 首充战斗换id 2020-07-17 17:40:30 +08:00
gaoxin 4e67a3f0bc 修复挂机界面黑边为题 2020-07-17 15:55:20 +08:00
zhangqiang 264f0b7323 bug 2020-07-17 15:14:15 +08:00
ZhangBiao 064ad3b8b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:40:43 +08:00
ZhangBiao b20e5e2f54 十绝阵伤害显示调整 2020-07-17 14:40:33 +08:00
jiaoyangna e63fb9e0cf 修改文字 2020-07-17 14:35:38 +08:00
jiaoyangna 068980325a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:15:56 +08:00
jiaoyangna 7faa067c52 宝物分解提交 2020-07-17 14:15:42 +08:00
zhangqiang 98670958a0 首冲拍脸 寻宝红点条件 2020-07-17 13:56:30 +08:00
ZhangBiao 63b8b36a37 剔除logo等信息 2020-07-17 13:38:02 +08:00
gaoxin 76d00dce34 支付接口调试 2020-07-17 11:39:24 +08:00