xiekaidong
|
83a5666725
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# Assets/arts/atlas/ui/act_common.asset
# Assets/arts/atlas/ui/act_common.spriteatlas
# Assets/arts/atlas/ui/common.asset
# Assets/arts/atlas/ui/common.spriteatlas
# Assets/proto/protocol.bytes
|
2023-09-16 17:56:32 +08:00 |
|
xiekaidong
|
a022065ef5
|
界面
|
2023-09-16 17:52:04 +08:00 |
|
xiekaidong
|
78b27b7607
|
资源处理
|
2023-09-15 21:46:10 +08:00 |
|
xiekaidong
|
53caadd7e5
|
更新资源
|
2023-09-15 21:01:19 +08:00 |
|
xiekaidong
|
bcb9e60c73
|
界面调整
|
2023-09-15 21:00:29 +08:00 |
|
Fang
|
0d50692a4f
|
请求优化
|
2023-09-15 20:54:35 +08:00 |
|
xiekaidong
|
35d8383450
|
更新资源
|
2023-09-15 20:48:00 +08:00 |
|
xiekaidong
|
e528334190
|
界面处理
|
2023-09-15 20:46:35 +08:00 |
|
陈希
|
e2abf80e5d
|
Merge branch 'fang/act' into 'dev_20230919'
圆月活动
See merge request b6-client/b6-unity!18
|
2023-09-15 11:33:16 +00:00 |
|
Fang
|
769cfbe34d
|
圆月活动
|
2023-09-15 19:23:25 +08:00 |
|
xiekaidong
|
753fba3b0d
|
更新资源
|
2023-09-15 18:34:09 +08:00 |
|
zhangpengfei
|
ee5e11f045
|
小丑动画修改
|
2023-09-15 18:20:27 +08:00 |
|
xiekaidong
|
ab0c8d0559
|
buff层级
|
2023-09-15 17:43:23 +08:00 |
|
xiekaidong
|
6f784eb8e3
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-15 17:41:40 +08:00 |
|
xiekaidong
|
cccce0625e
|
pvp战斗取消元素随机加权
|
2023-09-15 17:41:37 +08:00 |
|
Fang
|
94fcea9026
|
竞技场结算时同步当前积分
|
2023-09-15 17:38:42 +08:00 |
|
zhangpengfei
|
b42736678e
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-15 17:38:03 +08:00 |
|
zhangpengfei
|
d6eb5dfbe9
|
新角色皮肤上传
|
2023-09-15 17:37:55 +08:00 |
|
xiekaidong
|
0ba16ffa0c
|
更新配置和优化显示
|
2023-09-15 17:37:15 +08:00 |
|
xiekaidong
|
1c44759790
|
资源
|
2023-09-15 17:27:22 +08:00 |
|
Fang
|
833a583f97
|
梦魇酒馆spine导入
|
2023-09-15 17:19:38 +08:00 |
|
zhangpengfei
|
37da32c547
|
BOSS修改
|
2023-09-15 16:08:11 +08:00 |
|
zhangpengfei
|
bbb5804a24
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-15 15:31:07 +08:00 |
|
zhangpengfei
|
50e9a27318
|
新BOSS上传
|
2023-09-15 15:30:59 +08:00 |
|
Fang
|
ebf9ec6209
|
导入符文解锁图片资源
|
2023-09-15 15:29:24 +08:00 |
|
Fang
|
565322e62a
|
spine资源导入
|
2023-09-15 15:27:47 +08:00 |
|
xiekaidong
|
abbde65fff
|
音效
|
2023-09-14 21:16:02 +08:00 |
|
xiekaidong
|
1275c6494f
|
界面
|
2023-09-14 21:13:25 +08:00 |
|
Fang
|
a86dbc2116
|
新用户报错fix
|
2023-09-14 12:05:04 +08:00 |
|
Fang
|
575a7a90f7
|
编译
|
2023-09-14 11:08:40 +08:00 |
|
Fang
|
2b78eb4cc0
|
显示fix
|
2023-09-14 11:08:09 +08:00 |
|
Fang
|
845c800565
|
替换资源
|
2023-09-14 09:39:46 +08:00 |
|
xiekaidong
|
4117053230
|
界面调整
|
2023-09-13 20:43:33 +08:00 |
|
xiekaidong
|
d9110872bf
|
拼界面
|
2023-09-13 20:41:45 +08:00 |
|
Fang
|
0679e04395
|
属性fix
|
2023-09-13 18:24:56 +08:00 |
|
Fang
|
9345d10d6c
|
符文属性加成修改
|
2023-09-13 17:59:30 +08:00 |
|
Fang
|
f409368faa
|
bug fix
|
2023-09-13 15:45:27 +08:00 |
|
Fang
|
0a231c3f94
|
自动铸造开启等级
|
2023-09-13 11:03:18 +08:00 |
|
xiekaidong
|
47d4ccd4a6
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-13 09:43:43 +08:00 |
|
xiekaidong
|
96a0a976e6
|
优化
|
2023-09-13 09:43:41 +08:00 |
|
zhangpengfei
|
771b713f6d
|
新角色上传
|
2023-09-13 09:28:52 +08:00 |
|
xiekaidong
|
4ef44130e9
|
优化和上传特效
|
2023-09-13 09:19:18 +08:00 |
|
xiekaidong
|
00e06273ad
|
优化
|
2023-09-12 20:34:37 +08:00 |
|
xiekaidong
|
bcf3982203
|
显示bug修复
|
2023-09-12 20:27:00 +08:00 |
|
xiekaidong
|
eaed3e859e
|
资源调整
|
2023-09-12 20:13:37 +08:00 |
|
xiekaidong
|
17a349c66d
|
优化点击
|
2023-09-12 20:12:12 +08:00 |
|
xiekaidong
|
2a8cfe31e9
|
点击优化
|
2023-09-12 20:10:19 +08:00 |
|
xiekaidong
|
ce6127b71d
|
显示优化
|
2023-09-12 20:08:08 +08:00 |
|
xiekaidong
|
9f0fd56ab4
|
修复bug
|
2023-09-12 19:46:47 +08:00 |
|
xiekaidong
|
da10987311
|
更新资源
|
2023-09-12 19:20:54 +08:00 |
|