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 |
|
Fang
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
b9ee339355
|
界面调整
|
2023-08-31 20:18:23 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
xiekaidong
|
82b8c6a181
|
boss_rush
|
2023-08-30 19:11:51 +08:00 |
|
Fang
|
1c4236a20f
|
竞技场战令spine修改
|
2023-08-30 17:44:54 +08:00 |
|
xiekaidong
|
cd1cea12fa
|
bug修复
|
2023-08-29 21:04:37 +08:00 |
|
xiekaidong
|
3a690240f9
|
首领入侵活动界面
|
2023-08-29 19:03:40 +08:00 |
|
xiekaidong
|
44d66bb6c2
|
资源检查
|
2023-08-29 12:23:18 +08:00 |
|
xiekaidong
|
66bf185bd7
|
每日任务宝箱动画
|
2023-08-28 18:56:35 +08:00 |
|
Fang
|
eeae9e8382
|
段位奖励添加奖励光效
|
2023-08-28 17:42:13 +08:00 |
|
Fang
|
b460d9d8c5
|
段位奖励段位图标显示修改
|
2023-08-25 10:36:35 +08:00 |
|
陈希
|
ca7f897efe
|
Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包
See merge request b6-client/b6-unity!15
|
2023-08-24 10:24:23 +00:00 |
|
Fang
|
be98aa91d8
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:55 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
d716440747
|
界面处理
|
2023-08-23 17:46:57 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
Fang
|
5444cab3db
|
1
|
2023-08-23 15:50:21 +08:00 |
|
Fang
|
7837455596
|
竞技场段位奖励
|
2023-08-23 14:41:56 +08:00 |
|
xiekaidong
|
6441196517
|
一些描述
|
2023-08-18 18:36:08 +08:00 |
|
xiekaidong
|
02481f50b4
|
英雄基金
|
2023-08-18 18:08:58 +08:00 |
|
xiekaidong
|
cd3a75c78f
|
英雄基金
|
2023-08-18 11:38:26 +08:00 |
|
xiekaidong
|
f8c3dc9bb0
|
界面和协议
|
2023-08-17 18:15:39 +08:00 |
|
xiekaidong
|
81f6b85711
|
界面
|
2023-08-16 18:08:49 +08:00 |
|
xiekaidong
|
60a2c2ee3a
|
战令一键领取
|
2023-08-16 17:36:18 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
1e7440d170
|
夏日活动上报
|
2023-08-15 20:32:37 +08:00 |
|
xiekaidong
|
a645eb5c63
|
层级调整
|
2023-08-15 20:30:21 +08:00 |
|
xiekaidong
|
3527846c69
|
资源检查
|
2023-08-15 19:51:06 +08:00 |
|
xiekaidong
|
c597e71285
|
优化
|
2023-08-15 19:41:11 +08:00 |
|
xiekaidong
|
db2c20f2f1
|
适配
|
2023-08-15 17:42:22 +08:00 |
|
Fang
|
3b4a03cde8
|
多语言遮挡处理
|
2023-08-15 16:17:49 +08:00 |
|
Fang
|
be4c77474e
|
显示fix
|
2023-08-15 15:35:02 +08:00 |
|
xiekaidong
|
4d1635dc3b
|
背景特效
|
2023-08-15 14:59:48 +08:00 |
|
Fang
|
f788462596
|
皮肤道具点开界面
|
2023-08-14 19:35:04 +08:00 |
|