Commit Graph

423 Commits (7fb91910fd0da047c5ccd4add2e84bf85e78ee81)

Author SHA1 Message Date
gaoxin aa16826682 战斗先后手功能添加 2020-07-22 21:24:42 +08:00
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
zhangqiang 0b747a5179 竞猜币提交 2020-07-22 19:40:23 +08:00
jiaoyangna 35012ad758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 19:07:34 +08:00
jiaoyangna f8abe77d82 归元时检测大闹天宫队伍的神将 2020-07-22 19:07:29 +08:00
szxhzz 61a841abae 音频提交 2020-07-22 18:35:53 +08:00
ZhangBiao b444d31f17 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 17:29:03 +08:00
ZhangBiao 10bb654c40 十绝阵红点刷新修复 2020-07-22 17:28:34 +08:00
jiaoyangna 2ecf69827f 归元修改提交 2020-07-22 16:31:31 +08:00
jiaoyangna be357f9268 【归元】三星卡不在归元列表显示,不能对三星的归元 2020-07-22 16:25:10 +08:00
jiaoyangna 404a0ffedb 归元报错修改 2020-07-22 16:13:25 +08:00
jiaoyangna 69f61467a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 15:57:01 +08:00
jiaoyangna ba8b5a3c93 【宝物合成】一键合成预览处显示错误 2020-07-22 15:50:18 +08:00
ZhangBiao f1ab5780e4 切换界面黑屏问题解决 2020-07-22 14:34:00 +08:00
JieLing 932c592ea9 修改登录时注销sdk无法重新登录的问题 2020-07-22 11:42:37 +08:00
ZhangBiao 176ab5f359 2020-07-22 10:51:36 +08:00
ZhangBiao 2d79cc70e5 【战斗】解锁倍速提示,VIP改成特权 2020-07-22 10:33:31 +08:00
ZhangBiao 38ee63365c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 20:20:51 +08:00
ZhangBiao 934b6e8bb0 新章节未开启,奖励与地图已经更改问题修改 2020-07-21 20:20:39 +08:00
gaoxin 7f5296ea9e 删除无用文件夹 2020-07-21 19:27:43 +08:00
JieLing b87662e37c 去掉前端登录打点 2020-07-21 17:03:06 +08:00
gaoxin f13d13ff45 sdk修改 2020-07-21 17:01:23 +08:00
gongjiawei 05496217f7 音频更新 2020-07-21 16:06:07 +08:00
ZhangBiao 8ff8920d84 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 16:04:18 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00
szxhzz 127d675497 音频更新 2020-07-21 15:39:06 +08:00
szxhzz 78634d7e04 音频更新 2020-07-21 15:05:11 +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
gongjiawei 781a1e8453 音频更新 2020-07-21 14:24:57 +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
gongjiawei 1eae262785 音频更新 2020-07-21 11:41:45 +08:00
gaoxin 0992012713 Merge branch 'master_test' into master_develop 2020-07-21 11:40:13 +08:00
gaoxin f5ed76daa1 Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test 2020-07-21 11:32:58 +08:00
gaoxin 0db4c93ef7 修复登录界面登出事件无法触发的问题 2020-07-21 11:31:26 +08:00
jiaoyangna aa86f77fea 【充值】表里配的5级,实际创角就有入口 2020-07-21 11:31:05 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
ZhangBiao d3caa3d4cf 森罗调整 2020-07-21 10:30:25 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
gaoxin 6d3338d6b1 配置修改,version文件修改 2020-07-20 20:30:49 +08:00
jiaoyangna 9b7e47aaef Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx
2020-07-20 20:00:31 +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
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +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
gongjiawei 4b946aa324 音頻跟新 2020-07-20 15:52:33 +08:00
gongjiawei 78717037c0 音频更新 2020-07-20 15:50:31 +08:00
gaoxin ed0a54ab56 sdk更新,修改tapdb的channel对测试服和正式服进行区分 2020-07-20 15:36:25 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
gongjiawei b2380c9b62 音频更新 2020-07-20 14:04:23 +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
jiaoyangna b11c108e5d Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-20 09:47:28 +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
zhangqiang a8427d034c 字体修改 2020-07-17 19:48:25 +08:00
zhangqiang 57981fc393 字体修改 2020-07-17 19:36:23 +08:00
JieLing af9f316417 Merge branch 'master_develop' into master_test 2020-07-17 18:29:48 +08:00
jiaoyangna 0715821074 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 18:20:41 +08:00
jiaoyangna 9876ec5f5a 红点检测修改 2020-07-17 18:20:31 +08:00
gongjiawei 05fe46a84e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 18:06:24 +08:00
gongjiawei 3c6db51497 音频更新 2020-07-17 18:06:10 +08:00
jiaoyangna b56682cafd 5点刷新添加一个特权id 2020-07-17 18:04:37 +08:00
zhangqiang 19046587e4 竞猜结果修改 2020-07-17 17:59:46 +08:00
JieLing d4ac5059df Merge branch 'master_develop' into master_test 2020-07-17 17:51:23 +08:00
gaoxin b099f0e251 数据打点静态数据添加 2020-07-17 17:50:05 +08:00
jiaoyangna 3f576bbf3e 首充战斗换id 2020-07-17 17:40:30 +08:00
JieLing 29fc6f99eb Merge branch 'master_develop' into master_test 2020-07-17 17:00:55 +08:00
zhangqiang 6e59d44e5a 先屏蔽宝器一键合成 2020-07-17 16:40:38 +08:00
gongjiawei 8640cc4327 音频更新 2020-07-17 16:13:57 +08:00
JieLing c46047fe2c Merge branch 'master_develop' into master_test
# Conflicts:
#	data_execl/base_data/GuideConfig.xlsx
2020-07-17 16:13:04 +08:00
ZhangBiao ea564d7a7d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 16:06:01 +08:00
ZhangBiao 2db96229ca 战斗跳过按钮大小调整 2020-07-17 16:05:39 +08:00
gaoxin 4e67a3f0bc 修复挂机界面黑边为题 2020-07-17 15:55:20 +08:00
gaoxin 62c282f6e0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 15:55:00 +08:00
gongjiawei 61bee0b20b 音频更新 2020-07-17 15:49:57 +08:00
szxhzz 95e9f57db5 音频更新 2020-07-17 15:41:04 +08:00
zhangqiang 264f0b7323 bug 2020-07-17 15:14:15 +08:00
gaoxin 720c82aa0b 删除开场视频 2020-07-17 14:53:22 +08:00
gongjiawei 7e72d741c9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:48:27 +08:00
gongjiawei 765e2350ab 音频更新 2020-07-17 14:47:10 +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