Commit Graph

481 Commits (bd8e859703fb7123e8cbd31228ab065af5473811)
 

Author SHA1 Message Date
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
gaoxin 6d3338d6b1 配置修改,version文件修改 2020-07-20 20:30:49 +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
shihongyi 6b007ddcfb 巅峰战奖励调整 2020-07-20 17:45:04 +08:00
shihongyi 89e7841b12 竞技场战斗阶段掉落内容 2020-07-20 17:16:09 +08:00
shihongyi 458c4dd054 斗法排行奖励调整 2020-07-20 17:02:16 +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
liujiaqi 5f0b1ae349 月礼包新增礼包8,新增神将升星自选箱,开服狂欢3日7日奖励更改 2020-07-20 16:32:03 +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
shihongyi b9042bc782 置换卡池、魂印商店调整 2020-07-20 15:38:46 +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
liujiaqi 7f61f6317c 嫦娥共工大小调整 2020-07-20 14:31:59 +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 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
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