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 |
|
Fang
|
047f17e6f3
|
装备系统
|
2023-07-20 19:35:17 +08:00 |
|
Fang
|
2101a422bb
|
英雄图鉴
|
2023-07-14 17:08:08 +08:00 |
|
xiekaidong
|
2f01e53cba
|
资源问题
|
2023-07-04 15:41:12 +08:00 |
|
Fang
|
aae1ec0c8c
|
完善逻辑
|
2023-06-29 16:10:22 +08:00 |
|
Fang
|
764645f4d5
|
逻辑补充
|
2023-06-28 18:36:07 +08:00 |
|
Fang
|
80c02c4c82
|
竞技场
|
2023-06-27 18:27:38 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
chenxi
|
e0c176b6f0
|
图集
|
2023-06-16 15:39:02 +08:00 |
|
Fang
|
656f096c03
|
ui资源补充替换
|
2023-06-13 16:16:29 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
chenxi
|
83363f4694
|
主城资源
|
2023-06-05 19:54:50 +08:00 |
|
chenxi
|
2f6f2861b8
|
金猪动画
|
2023-06-05 15:08:25 +08:00 |
|
CloudJ
|
4d5ad2f87a
|
替换UI
|
2023-06-05 10:58:24 +08:00 |
|
chenxi
|
759bcedf74
|
任务界面
|
2023-06-03 20:30:20 +08:00 |
|
chenxi
|
900bea3586
|
英雄列表界面
|
2023-06-03 19:59:22 +08:00 |
|
chenxi
|
8f740dd397
|
账号删除界面
|
2023-06-03 19:50:26 +08:00 |
|
chenxi
|
8c1e33d0b8
|
选择语言界面替换
|
2023-06-03 19:47:22 +08:00 |
|
CloudJ
|
a52fae7a7e
|
替换主界面
|
2023-06-02 19:32:52 +08:00 |
|
chenxi
|
925dc49910
|
设置界面
|
2023-06-01 20:58:17 +08:00 |
|
chenxi
|
aba414d587
|
merge
|
2023-06-01 20:53:21 +08:00 |
|
chenxi
|
f369f5f8b5
|
替换设置界面
|
2023-06-01 20:51:49 +08:00 |
|
CloudJ
|
a1b9dcbf2e
|
替换一波ui
|
2023-06-01 20:47:43 +08:00 |
|
CloudJ
|
d1ab31227b
|
替换首充界面
|
2023-05-30 19:35:02 +08:00 |
|
CloudJ
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|