2955 Commits

Author SHA1 Message Date
Fang
e4b953c193 导入资源 2023-09-19 10:40:16 +08:00
d1306fbb31 20058hit 2023-09-19 10:37:55 +08:00
xiekaidong
1ef890c2b4 更新图集 2023-09-19 10:10:58 +08:00
xiekaidong
03956d8ecb 资源检查 2023-09-19 09:52:01 +08:00
xiekaidong
0c0be394ac 更新图集 2023-09-19 09:45:12 +08:00
xiekaidong
beb7ae495c 删除 2023-09-19 09:44:39 +08:00
xiekaidong
1b9826fced 上传特效 2023-09-19 09:30:22 +08:00
xiekaidong
8b235c7e3a 优化 2023-09-19 09:27:16 +08:00
xiekaidong
f07e452b82 提示 2023-09-18 21:51:21 +08:00
xiekaidong
f4a61a5cbd bug修复 2023-09-18 21:35:23 +08:00
xiekaidong
c58757a314 优化 2023-09-18 21:29:17 +08:00
xiekaidong
7d6398835a 优化显示 2023-09-18 21:05:52 +08:00
xiekaidong
41434625e2 bug修复 2023-09-18 20:52:32 +08:00
xiekaidong
f6e906a646 音效 2023-09-18 20:27:16 +08:00
xiekaidong
6050a42478 更新图集 2023-09-18 20:26:24 +08:00
xiekaidong
a2ff24f5a6 帮助界面 2023-09-18 20:22:02 +08:00
xiekaidong
c30e9d729c 优化和容错 2023-09-18 20:07:37 +08:00
xiekaidong
a5e8643589 图片设置 2023-09-18 19:45:53 +08:00
Fang
37ec3978b5 fix 2023-09-18 18:40:27 +08:00
Fang
29526815ba ui布局调整 2023-09-18 18:03:54 +08:00
xiekaidong
88632884bc Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-18 17:06:26 +08:00
xiekaidong
56fbcd4a6e 更新资源 2023-09-18 17:06:17 +08:00
Fang
3d37d44aa7 编译 2023-09-18 16:57:46 +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