xiekaidong
|
380bb080da
|
Merge branch 'dev_20231009' of http://git.juzugame.com/b6-client/b6-unity into dev_20231009
|
2023-10-09 17:36:20 +08:00 |
|
xiekaidong
|
f7f9b292c0
|
设置abname
|
2023-10-09 17:36:06 +08:00 |
|
Fang
|
ab0b38c501
|
更表
|
2023-10-09 17:33:06 +08:00 |
|
Fang
|
928dd46290
|
导入第四赛季入口banner资源
|
2023-10-09 17:11:46 +08:00 |
|
Fang
|
bf52ed6083
|
锦标赛领全部奖励修改
|
2023-10-09 16:34:37 +08:00 |
|
Fang
|
2ae155b480
|
修改锦标赛积分规则
|
2023-10-09 16:22:19 +08:00 |
|
xiekaidong
|
16d550aefa
|
设置abname
|
2023-10-09 16:01:10 +08:00 |
|
xiekaidong
|
8304af85ef
|
资源检查
|
2023-10-09 15:57:20 +08:00 |
|
xiekaidong
|
135658321b
|
更新配置
|
2023-10-09 15:51:46 +08:00 |
|
xiekaidong
|
c86b965ee6
|
Merge branch 'master' into dev_20231009
# Conflicts:
# Assets/lua/app/config/act_gift.lua.bytes
# Assets/lua/app/config/const.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/skill_rogue.lua.bytes
|
2023-10-09 15:48:59 +08:00 |
|
Fang
|
e2473b1d64
|
更表
|
2023-10-09 15:26:05 +08:00 |
|
Fang
|
a959e8a3a3
|
更表
|
2023-10-09 14:26:14 +08:00 |
|
Fang
|
262f74311e
|
锦标赛添加开启限制
|
2023-10-09 11:32:40 +08:00 |
|
Fang
|
09c0fb8c4f
|
符文副本结算波次处理
|
2023-10-09 11:10:10 +08:00 |
|
Fang
|
d4272eb86b
|
1
|
2023-10-09 10:57:00 +08:00 |
|
Fang
|
130d25ec22
|
符文副本结算去掉波次数据
|
2023-10-09 10:55:49 +08:00 |
|
Fang
|
06cecef8fc
|
超框
|
2023-10-09 09:42:40 +08:00 |
|
chenxi
|
949da0fdfd
|
战斗音效
|
2023-10-08 20:29:19 +08:00 |
|
chenxi
|
98cd8bd9c9
|
新皮肤头像
|
2023-10-08 20:24:41 +08:00 |
|
|
|
5575d26087
|
111
|
2023-10-08 20:12:21 +08:00 |
|
Fang
|
c6fb5ee0a8
|
锦标赛倒计时刷新fix
|
2023-10-08 18:30:59 +08:00 |
|
Fang
|
9d023efcb6
|
锦标赛跨组fix
|
2023-10-08 18:02:31 +08:00 |
|
Fang
|
a2b50a8315
|
锦标赛入口导入
|
2023-10-08 17:02:51 +08:00 |
|
Fang
|
2c40d73a0e
|
锦标赛战令进度条显示修改，帮助文案修改
|
2023-10-08 16:57:44 +08:00 |
|
Fang
|
2f9f35b98d
|
fix、导入新赛季头像
|
2023-10-08 15:00:02 +08:00 |
|
Fang
|
f76dd842fc
|
锦标赛fix
|
2023-10-08 11:36:15 +08:00 |
|
Fang
|
0abc5d6ab5
|
锦标赛奖励领取效果
|
2023-10-07 18:12:18 +08:00 |
|
Fang
|
a38f6816e3
|
编译
|
2023-10-07 17:42:49 +08:00 |
|
Fang
|
18d2e5c1fe
|
编译
|
2023-10-07 11:58:48 +08:00 |
|
xiekaidong
|
68ca7492e6
|
梦魇bug修复
|
2023-10-07 09:59:02 +08:00 |
|
|
|
cc805c09f7
|
竞技场战令4
|
2023-10-07 09:48:22 +08:00 |
|
Fang
|
77fd785a44
|
导入竞技场banner资源
|
2023-09-28 17:47:11 +08:00 |
|
zhangpengfei
|
962103db4c
|
p0045角色上传
|
2023-09-28 17:29:21 +08:00 |
|
Fang
|
b9393f591d
|
购买等级fix
|
2023-09-28 15:33:21 +08:00 |
|
Fang
|
1b3c0bc18b
|
帮助界面滚动fix
|
2023-09-28 15:26:44 +08:00 |
|
Fang
|
fcbb2a6c65
|
文案修改
|
2023-09-28 14:44:34 +08:00 |
|
Fang
|
b71c87b4b8
|
review
|
2023-09-28 12:00:07 +08:00 |
|
陈希
|
ebb7db4e18
|
Merge branch 'fang/tourn' into 'dev_20231009'
波次锦标赛、竞技场锦标赛
See merge request b6-client/b6-unity!19
|
2023-09-28 03:51:59 +00:00 |
|
Fang
|
d9a9716798
|
编译
|
2023-09-28 11:07:20 +08:00 |
|
Fang
|
3a986f6b7a
|
协议
|
2023-09-28 11:07:20 +08:00 |
|
Fang
|
8722d4b433
|
竞技场锦标赛
|
2023-09-28 11:07:20 +08:00 |
|
Fang
|
e1a49e73d9
|
波次锦标赛
|
2023-09-27 18:54:16 +08:00 |
|
xiekaidong
|
738f80d84b
|
提升版本号
v.1.4.2_android
v.1.4.3_android
|
2023-09-25 19:46:48 +08:00 |
|
xiekaidong
|
f4c431f50c
|
更新配置
|
2023-09-25 19:46:10 +08:00 |
|
Fang
|
45ce3c75c4
|
bug fix
|
2023-09-25 18:29:36 +08:00 |
|
xiekaidong
|
3ff2e9085e
|
提升版本号
|
2023-09-22 10:16:38 +08:00 |
|
xiekaidong
|
06d05d2fe8
|
更新资源
|
2023-09-22 10:11:51 +08:00 |
|
xiekaidong
|
401c2bd48f
|
容错
|
2023-09-22 09:58:41 +08:00 |
|
xiekaidong
|
de5805d1dc
|
bug修复
|
2023-09-22 09:52:30 +08:00 |
|
xiekaidong
|
e5a7bad0a9
|
提升版本号
v.1.4.1_android
|
2023-09-21 15:20:52 +08:00 |
|
