zhangqiang
|
4cec608eed
|
【巅峰赛】回滚提交2
|
2021-01-25 11:33:37 +08:00 |
zhangqiang
|
daa18f8996
|
Revert "【巅峰赛 bug】 三局两胜 第三场不刷新bug 3"
This reverts commit f6de94dcd5 .
|
2021-01-25 11:27:25 +08:00 |
zhangqiang
|
13bca53a69
|
Revert "【巅峰赛 bug】 三局两胜 第三场不刷新bug 2"
This reverts commit 55383c6684 .
|
2021-01-25 11:26:56 +08:00 |
zhangqiang
|
82bb3d164e
|
【巅峰赛】回滚提交1
|
2021-01-25 11:26:42 +08:00 |
zhangqiang
|
f6de94dcd5
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug 3
|
2021-01-21 14:50:37 +08:00 |
zhangqiang
|
55383c6684
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug 2
|
2021-01-21 14:48:08 +08:00 |
zhangqiang
|
6b8196637e
|
【巅峰赛 bug】 三局两胜 第三场不刷新bug
|
2021-01-21 14:47:51 +08:00 |
jiaoyangna
|
81373217b0
|
巅峰赛 帮助修改
(cherry picked from commit 03a22d27a5fcf6baf17746cd3eeba878eb9dda80)
|
2021-01-14 16:04:18 +08:00 |
jiaoyangna
|
0e8811df2b
|
【优化】背包中使用多个道具,明确标注数量
|
2020-12-30 11:02:44 +08:00 |
zhangqiang
|
b1e1fdcab0
|
【巅峰赛 bug】 竞猜修改2 + 巅峰赛结束后 竞猜界面没有刷新问题修改
|
2020-12-05 13:31:39 +08:00 |
zhangqiang
|
01fd511ea1
|
【巅峰赛】 竞猜结果前端显示错误
|
2020-12-05 13:31:14 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
zhangqiang
|
34d67b93f6
|
【巅峰赛】 赛程 三局第一局结果有问题 修改
|
2020-11-06 18:32:48 +08:00 |
zhangqiang
|
44350558c5
|
【巅峰赛】 头像特效设置层级有问题 线上
|
2020-11-06 15:49:08 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
zhangqiang
|
b853030d8a
|
巅峰战被淘汰还可自动进入战斗bug修复
|
2020-08-19 00:09:35 +08:00 |
zhangqiang
|
b2a54634d2
|
适配调整 巅峰赛入口
|
2020-08-15 00:08:25 +08:00 |
zhangqiang
|
74b9cc5c55
|
成员红点检测 巅峰战编队入口显示修复
|
2020-08-11 00:08:56 +08:00 |
zhangqiang
|
2a87d43fd0
|
bug
|
2020-07-31 17:36:06 +08:00 |
zhangqiang
|
565d0392fc
|
背景颜色根据星级变化
|
2020-07-31 15:40:43 +08:00 |
zhangqiang
|
7f9c4f6862
|
提交
|
2020-09-13 22:25:50 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
zhangqiang
|
fe01796ded
|
修改
|
2020-09-11 21:10:39 +08:00 |
jiaoyangna
|
6742056a93
|
冲突解决提交
|
2020-07-25 15:18:07 +08:00 |
zhangqiang
|
1845d662ab
|
巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称
|
2020-09-07 21:15:40 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
zhangqiang
|
abfde3e8a9
|
巅峰战bug and 使用按钮需求
|
2020-08-24 21:46:19 +08:00 |
zhangqiang
|
6238892d99
|
巅峰赛刷新调位置 赛程增加-1
|
2020-08-05 21:28:16 +08:00 |
zhangqiang
|
dbb563fbe5
|
播放第三场战斗动画修改
|
2020-07-24 10:01:48 +08:00 |
zhangqiang
|
688662836a
|
修改
|
2020-07-23 21:18:46 +08:00 |
zhangqiang
|
6a855cf7a2
|
巅峰赛问题修改
|
2020-07-23 20:39:21 +08:00 |
zhangqiang
|
94684153c3
|
回放三局两胜显示
|
2020-07-23 18:06:55 +08:00 |
zhangqiang
|
3b3dbec6a7
|
添加巅峰赛编队
|
2020-07-23 14:36:28 +08:00 |
zhangqiang
|
9bb7008a6d
|
淘汰赛战斗 可以观看多场记录
|
2020-07-23 12:19:45 +08:00 |
zhangqiang
|
db4ffb1e95
|
提交
|
2020-07-23 11:08:11 +08:00 |
zhangqiang
|
f844305e0e
|
Merge branch 'master_develop' into master_arena
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
|
2020-07-22 21:55:01 +08:00 |
zhangqiang
|
0b747a5179
|
竞猜币提交
|
2020-07-22 19:40:23 +08:00 |
zhangqiang
|
19046587e4
|
竞猜结果修改
|
2020-07-17 17:59:46 +08:00 |
zhangqiang
|
897b14aa65
|
巅峰战提交
|
2020-07-17 10:28:02 +08:00 |
zhangqiang
|
1aa78a2dd7
|
戴峰提交
|
2020-07-16 15:52:19 +08:00 |
zhangqiang
|
6fbed83b28
|
巅峰赛修改提交
|
2020-07-16 14:13:27 +08:00 |
zhangqiang
|
2c744690bc
|
赛程数据合并
|
2020-07-16 10:13:32 +08:00 |
zhangqiang
|
bdf9331b79
|
巅峰战提交
|
2020-07-15 18:23:40 +08:00 |
zhangqiang
|
f3048c9904
|
巅峰赛 修改
|
2020-07-14 20:27:23 +08:00 |