xiekaidong
|
56fbcd4a6e
|
更新资源
|
2023-09-18 17:06:17 +08:00 |
|
xiekaidong
|
292198793e
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-18 16:39:06 +08:00 |
|
xiekaidong
|
3ea4515098
|
音效
|
2023-09-18 16:39:03 +08:00 |
|
Fang
|
b92f858295
|
界面优化
|
2023-09-18 16:38:04 +08:00 |
|
|
|
5e7537ebb0
|
角色版权优化03、07、08、14
|
2023-09-18 16:37:25 +08:00 |
|
zhangpengfei
|
442320c2be
|
旧角色替换
|
2023-09-18 16:12:57 +08:00 |
|
xiekaidong
|
188a85d723
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-18 16:04:06 +08:00 |
|
xiekaidong
|
9b95508c42
|
优化
|
2023-09-18 16:04:03 +08:00 |
|
Fang
|
bddd14fdd4
|
Merge branch 'fang/runes' into dev_20230919
|
2023-09-18 14:57:16 +08:00 |
|
Fang
|
448aa0659e
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:57:00 +08:00 |
|
xiekaidong
|
c54a6c48b9
|
更新图集，编译lua
|
2023-09-18 14:53:41 +08:00 |
|
xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
b0ca1e6132
|
循环活动的一些处理
|
2023-09-18 14:43:39 +08:00 |
|
xiekaidong
|
916c9d9a69
|
上传特效
|
2023-09-18 14:09:19 +08:00 |
|
xiekaidong
|
94f5ea647f
|
界面调整
|
2023-09-18 12:02:52 +08:00 |
|
xiekaidong
|
b044273afc
|
bug修复
|
2023-09-18 12:00:41 +08:00 |
|
xiekaidong
|
79c4fd7907
|
优化显示
|
2023-09-18 11:40:53 +08:00 |
|
xiekaidong
|
8a7e4ec47c
|
调整
|
2023-09-18 11:22:40 +08:00 |
|
xiekaidong
|
33e84e5cc1
|
优化显示
|
2023-09-18 11:21:37 +08:00 |
|
xiekaidong
|
c0aeccf71a
|
显示优化
|
2023-09-18 10:52:38 +08:00 |
|
xiekaidong
|
f12896f346
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919
|
2023-09-18 10:38:22 +08:00 |
|
xiekaidong
|
b3f490c9ac
|
bug修复
|
2023-09-18 10:38:18 +08:00 |
|
Fang
|
94a532d553
|
更新图集
|
2023-09-18 10:21:59 +08:00 |
|
Fang
|
6792ac4fd7
|
更新
|
2023-09-18 10:17:16 +08:00 |
|
xiekaidong
|
ae1aeba1c5
|
编译lua
|
2023-09-18 09:39:22 +08:00 |
|
xiekaidong
|
c8ac729532
|
bug修复
|
2023-09-18 09:37:52 +08:00 |
|
xiekaidong
|
1cf27e1a54
|
编译lua
|
2023-09-16 20:26:20 +08:00 |
|
xiekaidong
|
f78213bce1
|
界面调整
|
2023-09-16 20:24:32 +08:00 |
|
xiekaidong
|
91dc07f589
|
帮助界面
|
2023-09-16 20:17:20 +08:00 |
|
xiekaidong
|
7eed36b812
|
选择界面表现
|
2023-09-16 19:39:51 +08:00 |
|
xiekaidong
|
ca342100a2
|
升级表现
|
2023-09-16 19:17:54 +08:00 |
|
xiekaidong
|
1ecdf0cd14
|
界面优化
|
2023-09-16 18:45:58 +08:00 |
|
xiekaidong
|
bdcf3f995b
|
优化
|
2023-09-16 18:13:32 +08:00 |
|
xiekaidong
|
2a8107ddce
|
第一版梦魇酒馆，差表现
|
2023-09-16 18:08:26 +08:00 |
|
xiekaidong
|
d924919e22
|
更新配置
|
2023-09-16 17:58:05 +08:00 |
|
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 |
|
