763 Commits

Author SHA1 Message Date
xiekaidong
0942c88d19 设置 2023-09-19 11:24:01 +08:00
Fang
299b03213f 1 2023-09-19 10:44:56 +08:00
Fang
6266224727 预制体修改 2023-09-19 10:42:33 +08:00
Fang
e4b953c193 导入资源 2023-09-19 10:40:16 +08:00
xiekaidong
03956d8ecb 资源检查 2023-09-19 09:52:01 +08:00
xiekaidong
7d6398835a 优化显示 2023-09-18 21:05:52 +08:00
xiekaidong
a2ff24f5a6 帮助界面 2023-09-18 20:22:02 +08:00
xiekaidong
c30e9d729c 优化和容错 2023-09-18 20:07:37 +08:00
Fang
37ec3978b5 fix 2023-09-18 18:40:27 +08:00
Fang
29526815ba ui布局调整 2023-09-18 18:03:54 +08:00
Fang
b92f858295 界面优化 2023-09-18 16:38:04 +08:00
Fang
448aa0659e 符文自动淬炼修改、特效完善 2023-09-18 14:57:00 +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
94f5ea647f 界面调整 2023-09-18 12:02:52 +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
b3f490c9ac bug修复 2023-09-18 10:38:18 +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
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
bcb9e60c73 界面调整 2023-09-15 21:00:29 +08:00
xiekaidong
e528334190 界面处理 2023-09-15 20:46:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
ab0c8d0559 buff层级 2023-09-15 17:43:23 +08:00
xiekaidong
1c44759790 资源 2023-09-15 17:27:22 +08:00
xiekaidong
1275c6494f 界面 2023-09-14 21:13:25 +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
xiekaidong
c88edc50e5 界面调整 2023-09-13 16:33:56 +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
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
ce6127b71d 显示优化 2023-09-12 20:08:08 +08:00
Fang
dc1b6c9838 显示fix 2023-09-12 15:27:50 +08:00
陈希
4094f79f7b Merge branch 'fang/runes' into 'dev_20230919'
符文功能

See merge request b6-client/b6-unity!17
2023-09-12 06:50:32 +00:00
xiekaidong
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
b5f498ad7c 优化 2023-09-12 11:17:46 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
1d12b1c1e8 符文副本 2023-09-11 20:02:19 +08:00