Commit Graph

445 Commits (ed0a54ab5669bf7e7288988ba53fbeef99773139)
 

Author SHA1 Message Date
gaoxin ed0a54ab56 sdk更新,修改tapdb的channel对测试服和正式服进行区分 2020-07-20 15:36:25 +08:00
gaoxin f27b97d128 打包配置修改 2020-07-19 08:59:14 +08:00
gaoxin 7e96307883 Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test 2020-07-18 21:07:01 +08:00
JieLing 7350a1cf85 测试version文件修改 2020-07-18 21:06:23 +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
JieLing f7179e9a3d 内网测试0.15.33 2020-07-17 19:51:07 +08:00
zhangqiang a8427d034c 字体修改 2020-07-17 19:48:25 +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
liujiaqi f5dab0f98d 装备名修改 2020-07-17 18:19:12 +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 f7db19b05d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 18:04:53 +08:00
jiaoyangna b56682cafd 5点刷新添加一个特权id 2020-07-17 18:04:37 +08:00
shihongyi 2264a3a298 分离宝囊和限时抽卡特权及计数 2020-07-17 18:02:26 +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
altair 6d07756f4b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 17:29:48 +08:00
altair d4a1a2d5c5 修改配音配置 2020-07-17 17:29:41 +08:00
shihongyi 47bb773f6e bug 2020-07-17 17:01:17 +08:00
JieLing 29fc6f99eb Merge branch 'master_develop' into master_test 2020-07-17 17:00:55 +08:00
altair eb571c6ea9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 16:58:24 +08:00
altair 1b17159e96 删除错误配音及修改攻击音效 2020-07-17 16:58:16 +08:00
skuld 5edc4c5e1a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 16:52:20 +08:00
skuld 752634e423 修改挂机奖励提示邮件文字 2020-07-17 16:52:11 +08:00
zhangqiang 6e59d44e5a 先屏蔽宝器一键合成 2020-07-17 16:40:38 +08:00
liujiaqi b2ee40a04a 演示战斗更新 2020-07-17 16:16:18 +08:00
gongjiawei c560b6acc0 音频更新 2020-07-17 16:15:28 +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
shihongyi ca8db6ccce Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 15:58:10 +08:00
shihongyi 44fde17a80 VIPbug 2020-07-17 15:56:27 +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
liujiaqi 70c580bb57 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:46:17 +08:00
liujiaqi b354c2b214 共工敌方大小,4星英雄技能 2020-07-17 14:46:01 +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