gaoxin
|
ed0a54ab56
|
sdk更新,修改tapdb的channel对测试服和正式服进行区分
|
2020-07-20 15:36:25 +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
|
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 |
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 |
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 |
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 |
ZhangBiao
|
cb745e26c9
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-17 13:58:45 +08:00 |
ZhangBiao
|
058d079190
|
18岁
|
2020-07-17 13:58:22 +08:00 |
zhangqiang
|
98670958a0
|
首冲拍脸 寻宝红点条件
|
2020-07-17 13:56:30 +08:00 |
ZhangBiao
|
63b8b36a37
|
剔除logo等信息
|
2020-07-17 13:38:02 +08:00 |
JieLing
|
00422c4be7
|
修复战斗报错
|
2020-07-17 11:51:36 +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 |
szxhzz
|
e95d071139
|
音频更新
|
2020-07-17 11:25:09 +08:00 |
jiaoyangna
|
adc5895d94
|
首充十级英雄属性天赋错误修改提交
|
2020-07-17 11:16:44 +08:00 |
ZhangBiao
|
3f1c10f668
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-16 20:55:52 +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 |
szxhzz
|
531a21608b
|
音频更新
|
2020-07-16 20:53:40 +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 |