puxuan
|
743d0f097b
|
特权
|
2025-10-08 16:03:28 +08:00 |
|
puxuan
|
1c5b577038
|
活动
|
2025-09-25 16:05:10 +08:00 |
|
puxuan
|
18296991a2
|
商业化
|
2025-09-25 11:41:03 +08:00 |
|
puxuan
|
08d3ed2d7e
|
商店
|
2025-09-24 16:23:21 +08:00 |
|
puxuan
|
34518800c4
|
fix bug
|
2025-09-22 17:38:01 +08:00 |
|
puxuan
|
4af4b48bca
|
fix bug
|
2025-09-16 15:28:04 +08:00 |
|
puxuan
|
a6dbfc3fa9
|
fix bug
|
2025-09-04 16:22:50 +08:00 |
|
puxuan
|
104a6d1bf5
|
场景
|
2025-09-02 17:30:35 +08:00 |
|
puxuan
|
db6852ca01
|
res
|
2025-08-27 20:30:36 +08:00 |
|
puxuan
|
504e40eb38
|
res
|
2025-08-27 19:07:24 +08:00 |
|
puxuan
|
a9c7c04316
|
fix bug
|
2025-08-27 16:24:09 +08:00 |
|
puxuan
|
29317b4ea4
|
fix bug
|
2025-08-27 16:09:59 +08:00 |
|
puxuan
|
f5a3400308
|
fix bug
|
2025-08-21 11:35:08 +08:00 |
|
puxuan
|
ecd5958b55
|
fix bug
|
2025-08-20 15:57:02 +08:00 |
|
puxuan
|
5fbf156762
|
英雄
|
2025-08-20 11:43:19 +08:00 |
|
puxuan
|
8c228bfc90
|
英雄
|
2025-08-19 21:14:17 +08:00 |
|
puxuan
|
9bfbada234
|
fix bug
|
2025-08-19 20:33:25 +08:00 |
|
puxuan
|
1aff7876ec
|
抽卡
|
2025-08-12 19:44:10 +08:00 |
|
puxuan
|
54cdfc3e47
|
抽卡
|
2025-08-11 20:39:27 +08:00 |
|
puxuan
|
d9ddc699c9
|
设置
|
2025-08-11 10:18:06 +08:00 |
|
puxuan
|
8913c7fc88
|
设置
|
2025-08-08 17:14:39 +08:00 |
|
puxuan
|
2c8a5f70e5
|
res
|
2025-08-08 14:19:46 +08:00 |
|
puxuan
|
dd1063d61e
|
task
|
2025-08-06 20:46:47 +08:00 |
|
puxuan
|
2080d5d643
|
挂机
|
2025-07-28 20:37:09 +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
|
43222b0299
|
主界面
|
2025-05-13 00:12:08 +08:00 |
|
kai
|
986b121df4
|
升级引擎
|
2025-04-30 23:12:28 +08:00 |
|
Fang
|
e1a49e73d9
|
波次锦标赛
|
2023-09-27 18:54:16 +08:00 |
|
Fang
|
01d6a4b439
|
圆月头像框上传
|
2023-09-19 20:02:37 +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
|
a022065ef5
|
界面
|
2023-09-16 17:52:04 +08:00 |
|
xiekaidong
|
e528334190
|
界面处理
|
2023-09-15 20:46:35 +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
|
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
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
Fang
|
30bf431636
|
编译
|
2023-08-11 16:03:20 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
Fang
|
02da483630
|
装备升级材料获取
|
2023-07-21 09:51:28 +08:00 |
|