puxuan
|
2080d5d643
|
挂机
|
2025-07-28 20:37:09 +08:00 |
|
puxuan
|
7db28b8e49
|
arena
|
2025-07-21 21:05:32 +08:00 |
|
kai
|
4fb30c128d
|
每日挑战
|
2025-07-16 21:56:44 +08:00 |
|
kai
|
4429fb0e24
|
竞技场
|
2025-07-13 23:09:23 +08:00 |
|
puxuan
|
a4c4632f98
|
res
|
2025-07-04 12:54:20 +08:00 |
|
puxuan
|
3e707f40a6
|
res
|
2025-06-25 22:44:41 +08:00 |
|
puxuan
|
99cccbbb75
|
res
|
2025-06-17 19:59:50 +08:00 |
|
puxuan
|
43222b0299
|
主界面
|
2025-05-13 00:12:08 +08:00 |
|
kai
|
986b121df4
|
升级引擎
|
2025-04-30 23:12:28 +08:00 |
|
Fang
|
4edac166cb
|
资源
|
2024-01-26 10:08:06 +08:00 |
|
Fang
|
9281fa7205
|
资源导入
|
2024-01-25 14:46:37 +08:00 |
|
Fang
|
5ff0c61668
|
战令入口bannner导入
|
2023-12-26 10:52:06 +08:00 |
|
Fang
|
931b027788
|
导入头像、竞技场入口banner资源
|
2023-11-15 10:36:32 +08:00 |
|
Fang
|
1777464ea5
|
导入ui资源
|
2023-10-20 15:41:36 +08:00 |
|
Fang
|
928dd46290
|
导入第四赛季入口banner资源
|
2023-10-09 17:11:46 +08:00 |
|
Fang
|
e1a49e73d9
|
波次锦标赛
|
2023-09-27 18:54:16 +08:00 |
|
xiekaidong
|
00e53beccd
|
设置abname
|
2023-09-20 17:44:40 +08:00 |
|
Fang
|
01d6a4b439
|
圆月头像框上传
|
2023-09-19 20:02:37 +08:00 |
|
Fang
|
8ec42e8a10
|
导入战令banner、fix
|
2023-09-19 11:52:59 +08:00 |
|
xiekaidong
|
0c0be394ac
|
更新图集
|
2023-09-19 09:45:12 +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 |
|
Fang
|
94a532d553
|
更新图集
|
2023-09-18 10:21:59 +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
|
e528334190
|
界面处理
|
2023-09-15 20:46:35 +08:00 |
|
Fang
|
769cfbe34d
|
圆月活动
|
2023-09-15 19:23:25 +08:00 |
|
xiekaidong
|
1c44759790
|
资源
|
2023-09-15 17:27:22 +08:00 |
|
Fang
|
ebf9ec6209
|
导入符文解锁图片资源
|
2023-09-15 15:29:24 +08:00 |
|
xiekaidong
|
d84ffd490d
|
资源检查更新图集
|
2023-09-13 14:58:54 +08:00 |
|
xiekaidong
|
da10987311
|
更新资源
|
2023-09-12 19:20:54 +08:00 |
|
Fang
|
6eeff31530
|
符文功能
|
2023-09-12 10:41:44 +08:00 |
|
xiekaidong
|
b4f2b23cb2
|
符文副本
|
2023-09-12 10:06:47 +08:00 |
|
xiekaidong
|
1d12b1c1e8
|
符文副本
|
2023-09-11 20:02:19 +08:00 |
|
xiekaidong
|
4da792de57
|
更新资源
|
2023-09-09 16:13:44 +08:00 |
|
xiekaidong
|
dbb30676a2
|
符文副本主界面
|
2023-09-07 19:15:01 +08:00 |
|
xiekaidong
|
d83509fc3f
|
资源处理
|
2023-09-06 18:47:40 +08:00 |
|
xiekaidong
|
e936d45746
|
设置abname
|
2023-09-05 20:55:51 +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 |
|
Fang
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
Fang
|
7d0f23df51
|
竞技场入口banner修改
|
2023-08-30 18:13:05 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
d716440747
|
界面处理
|
2023-08-23 17:46:57 +08:00 |
|
Fang
|
ca460b1b01
|
通行证banner资源导入
|
2023-08-23 16:58:52 +08:00 |
|
Fang
|
7837455596
|
竞技场段位奖励
|
2023-08-23 14:41:56 +08:00 |
|