Commit Graph

847 Commits (9d5280d025ed030ed5b9423bbdbdbe9cd7a9877a)
 

Author SHA1 Message Date
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 b57eb71974 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 10:41:08 +08:00
ZhangBiao f9ecb13bd3 战斗跳过按钮 2020-07-20 10:40:55 +08:00
shihongyi e10ec6728f 调整部分成就前置 2020-07-20 10:28:08 +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 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
altair 734feeadf4 修改部分文字描述 2020-07-17 21:39:48 +08:00
kansa 994d90a086 修改商店bug 2020-07-17 21:21:22 +08:00
shihongyi b4ee8d9aea 首充5级 2020-07-17 21:04:09 +08:00
zhangqiang c6b5321424 bug 2020-07-17 20:52:44 +08:00
zhangqiang 480e810478 添加文字 2020-07-17 20:06:48 +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
zhangqiang 57981fc393 字体修改 2020-07-17 19:36:23 +08:00
kansa 640df86d5c 增加轩辕宝境相关表,修改关联表,功能开发用 2020-07-17 18:43:47 +08:00
shihongyi c817c03411 竞技场累计次数奖励 2020-07-17 18:35:17 +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
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
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