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 |
|
xiekaidong
|
4da792de57
|
更新资源
|
2023-09-09 16:13:44 +08:00 |
|
xiekaidong
|
059c6ca56b
|
符文副本
|
2023-09-08 18:54:00 +08:00 |
|
xiekaidong
|
65bbbaa0cc
|
界面调整
|
2023-09-08 10:24:39 +08:00 |
|
xiekaidong
|
dbb30676a2
|
符文副本主界面
|
2023-09-07 19:15:01 +08:00 |
|
xiekaidong
|
2dd0c48961
|
界面和资源
|
2023-09-07 15:21:53 +08:00 |
|
xiekaidong
|
d83509fc3f
|
资源处理
|
2023-09-06 18:47:40 +08:00 |
|
xiekaidong
|
c028971870
|
符文副本
|
2023-09-06 16:57:13 +08:00 |
|
xiekaidong
|
e936d45746
|
设置abname
|
2023-09-05 20:55:51 +08:00 |
|
xiekaidong
|
1ac93875aa
|
资源检查
|
2023-09-05 20:52:02 +08:00 |
|
xiekaidong
|
20802d3bea
|
优化
|
2023-09-05 18:26:28 +08:00 |
|
xiekaidong
|
aa3f69a043
|
显示优化
|
2023-09-05 18:24:14 +08:00 |
|
xiekaidong
|
ac9253f074
|
编译lua
|
2023-09-05 17:36:54 +08:00 |
|
xiekaidong
|
29f0e84ee0
|
14天丢图问题
|
2023-09-04 17:50:47 +08:00 |
|
xiekaidong
|
c15bf48f06
|
图集，资源修改
|
2023-09-04 09:46:55 +08:00 |
|
xiekaidong
|
f7fe141786
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# Assets/arts/atlas/icon/item.asset
# Assets/arts/atlas/ui/act_common.asset
# Assets/arts/atlas/ui/act_common.asset.meta
# Assets/arts/atlas/ui/act_common.spriteatlas
# Assets/arts/atlas/ui/act_common.spriteatlas.meta
# Assets/arts/atlas/ui/common.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta
# Assets/arts/textures/icon/item/51.png.meta
# Assets/arts/textures/ui/act_common.meta
# Assets/arts/textures/ui/act_common/act_common_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_4.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_5.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_6.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_4.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_5.png.meta
# Assets/arts/textures/ui/act_common/act_common_dec_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_line_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_line_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_progress_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_progress_bg.png.meta
# Assets/arts/textures/ui/act_common/act_common_select.png.meta
# Assets/arts/textures/ui/act_common/act_fourteen_dec_1.png.meta
# Assets/arts/textures/ui/act_common/act_fourteen_dec_2.png.meta
# Assets/arts/textures/ui/common/common_board_126.png.meta
# Assets/proto/protocol.bytes
|
2023-09-01 21:19:26 +08:00 |
|
xiekaidong
|
f0889cb678
|
首领公开赛
|
2023-09-01 21:10:25 +08:00 |
|