Commit Graph

227 Commits (b87662e37c6e1443eb1d4586b5d7be31dafaa39c)

Author SHA1 Message Date
JieLing b87662e37c 去掉前端登录打点 2020-07-21 17:03:06 +08:00
gaoxin 0db4c93ef7 修复登录界面登出事件无法触发的问题 2020-07-21 11:31:26 +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
jiaoyangna d1fd538542 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 11:38:26 +08:00
jiaoyangna 96c16ca7f8 去掉log 2020-07-17 11:38:18 +08:00
zhangqiang 25896729ff 商店去掉刷新红点 2020-07-17 11:32:20 +08:00
zhangqiang ebca764861 首冲 2020-07-17 11:27:03 +08:00
jiaoyangna adc5895d94 首充十级英雄属性天赋错误修改提交 2020-07-17 11:16:44 +08:00
ZhangBiao bfe29c5601 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-16 20:55:34 +08:00
ZhangBiao 3231f857af 工会祭祀援助红点、十绝阵排行修改 2020-07-16 20:53:17 +08:00
gaoxin 542c76916d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 20:43:23 +08:00
gaoxin 3152ff0f41 修复部分技能报错的问题 2020-07-16 20:43:11 +08:00
jiaoyangna 3ae65767d0 幸运探宝, 2020-07-16 20:36:54 +08:00
gaoxin 7a7446f145 sdk可以正常登录了 2020-07-16 19:51:38 +08:00
zhangqiang 8f96d9f067 探宝红点 2020-07-16 18:01:03 +08:00
ZhangBiao a27c474098 协议 2020-07-16 17:28:48 +08:00
gaoxin 5b7b28f1f9 sdk接入结构修改 2020-07-16 17:00:24 +08:00