shihongyi
|
cac0384012
|
屏充值
|
2020-07-24 16:04:31 +08:00 |
ZhangBiao
|
7fb91910fd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 15:22:30 +08:00 |
ZhangBiao
|
b3ddd8fc96
|
|
2020-07-24 15:22:17 +08:00 |
shihongyi
|
1ffb97cf9f
|
巅峰赛开启时间
|
2020-07-24 15:16:44 +08:00 |
zhangqiang
|
6238892d99
|
巅峰赛刷新调位置 赛程增加-1
|
2020-08-05 21:28:16 +08:00 |
zhangqiang
|
4d0b53adf9
|
巅峰赛货币显示
|
2020-08-05 21:03:36 +08:00 |
JieLing
|
7a37339547
|
猕猴桃测试服 0.1.2
|
2020-07-24 13:51:54 +08:00 |
ZhangBiao
|
0ad52a3855
|
活动暂时关闭
|
2020-07-24 13:39:02 +08:00 |
ZhangBiao
|
f27300721a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 12:14:52 +08:00 |
ZhangBiao
|
1f5440c2e6
|
bug修复
|
2020-07-24 12:11:00 +08:00 |
shihongyi
|
bffd51518d
|
归元
|
2020-07-24 12:10:35 +08:00 |
skuld
|
be095cbb7b
|
修改竞技场帮助文本
|
2020-07-24 11:19:16 +08:00 |
zhangqiang
|
42959d0257
|
编队bug
|
2020-07-24 11:05:40 +08:00 |
shihongyi
|
a5e0f98bcd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:46:12 +08:00 |
shihongyi
|
d4f48e575d
|
暂屏付费之2
|
2020-07-24 10:45:51 +08:00 |
kansa
|
cbfc420a96
|
修改竞技场刷新时间为7天
|
2020-07-24 10:43:32 +08:00 |
jiaoyangna
|
667b3e0bf5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:32:45 +08:00 |
jiaoyangna
|
15976637f4
|
log提交
|
2020-07-24 10:32:27 +08:00 |
ZhangBiao
|
5edb6c9234
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:30:56 +08:00 |
ZhangBiao
|
f7424e83ca
|
元素共鸣
|
2020-07-24 10:30:33 +08:00 |
JieLing
|
ac344a2d99
|
修复tapdb用户id
|
2020-07-24 10:22:20 +08:00 |
shihongyi
|
dc9fa4e880
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-24 10:08:06 +08:00 |
shihongyi
|
7418fd2fa7
|
暂屏充值test
|
2020-07-24 10:06:54 +08:00 |
zhangqiang
|
dbb563fbe5
|
播放第三场战斗动画修改
|
2020-07-24 10:01:48 +08:00 |
zhangqiang
|
485c81da9f
|
禁止上下阵提示文字
|
2020-07-24 09:36:19 +08:00 |
JieLing
|
2899bb433c
|
猕猴桃 测试服 0.1.1
|
2020-07-23 21:32:12 +08:00 |
zhangqiang
|
3fa23c25ea
|
修改界面id
|
2020-07-23 21:29:40 +08:00 |
gaoxin
|
c8c06b9493
|
判断错误
|
2020-07-23 21:26:03 +08:00 |
zhangqiang
|
3588a17c00
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
# data_execl/base_data/UIConfig.xlsx
|
2020-07-23 21:24:00 +08:00 |
zhangqiang
|
688662836a
|
修改
|
2020-07-23 21:18:46 +08:00 |
JieLing
|
7b2bc16abe
|
bugly添加
|
2020-07-23 21:10:35 +08:00 |
JieLing
|
291ab0ecf7
|
漏掉的文件
|
2020-07-23 20:46:51 +08:00 |
zhangqiang
|
6a855cf7a2
|
巅峰赛问题修改
|
2020-07-23 20:39:21 +08:00 |
gaoxin
|
95cbec95e0
|
添加包名获取,添加账号创建打点。
|
2020-07-23 20:04:25 +08:00 |
ZhangBiao
|
c268538c0e
|
共鸣资源替换
|
2020-07-23 19:46:54 +08:00 |
ZhangBiao
|
2d84c3137f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 19:05:51 +08:00 |
ZhangBiao
|
7b795f0daa
|
森罗bug
|
2020-07-23 19:05:43 +08:00 |
shihongyi
|
d820ef152a
|
bugfix
|
2020-07-23 18:19:26 +08:00 |
zhangqiang
|
94684153c3
|
回放三局两胜显示
|
2020-07-23 18:06:55 +08:00 |
gaoxin
|
f761bd5b9c
|
sdk代码文件替换
|
2020-07-23 17:45:23 +08:00 |
ZhangBiao
|
259daf6a92
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 17:42:46 +08:00 |
ZhangBiao
|
e0d156ad74
|
森罗英雄全部死亡战斗报错
|
2020-07-23 17:42:17 +08:00 |
shihongyi
|
de99aed8a5
|
充值表修改备注、献祭表id大小写、调整转盘奖励
|
2020-07-23 17:32:12 +08:00 |
gaoxin
|
3fc23499f9
|
获取包名方法添加
|
2020-07-23 17:28:01 +08:00 |
gaoxin
|
6f2a3c1c6c
|
新出包需求添加,sdk结构修改
|
2020-07-23 17:16:47 +08:00 |
jiaoyangna
|
5894babbf0
|
英雄献祭修改提交
|
2020-07-23 16:26:51 +08:00 |
ZhangBiao
|
4114a241dd
|
|
2020-07-23 16:02:11 +08:00 |
ZhangBiao
|
7fb5ac778f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:44:51 +08:00 |
ZhangBiao
|
9b290c1ed5
|
图片资源替换
|
2020-07-23 15:44:40 +08:00 |
jiaoyangna
|
4af617da49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:43:23 +08:00 |