111 Commits

Author SHA1 Message Date
puxuan
ee14aded6a fix bug 2025-09-05 14:28:41 +08:00
puxuan
558cfdf2d8 功能开启 2025-09-05 10:50:01 +08:00
puxuan
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
6b828c55c0 fix bug 2025-09-03 19:58:45 +08:00
puxuan
db721dbb53 fix bug 2025-08-28 10:38:47 +08:00
puxuan
06addac953 fix bug 2025-08-27 14:22:36 +08:00
puxuan
a4fdfb1dde 头像 2025-08-22 17:50:07 +08:00
puxuan
e360bb7662 英雄 2025-08-21 17:45:53 +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
457b3b23a8 fix bug 2025-08-19 17:32:44 +08:00
puxuan
14c28c83bf fix bug 2025-08-18 11:49:07 +08:00
puxuan
dd1063d61e task 2025-08-06 20:46:47 +08:00
puxuan
d0fa3731bb arena 2025-07-22 20:43:38 +08:00
puxuan
604b634b80 chapter 2025-07-03 20:56:56 +08:00
puxuan
d66db62d4b hero 2025-06-30 22:02:12 +08:00
kai
f199aa4642 hero 2025-06-28 19:10:51 +08:00
puxuan
43222b0299 主界面 2025-05-13 00:12:08 +08:00
xiekaidong
03956d8ecb 资源检查 2023-09-19 09:52:01 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
1ac93875aa 资源检查 2023-09-05 20:52:02 +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
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
xiekaidong
3a690240f9 首领入侵活动界面 2023-08-29 19:03:40 +08:00
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +08:00
xiekaidong
3527846c69 资源检查 2023-08-15 19:51:06 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
b1bb2f0302 处理界面显示 2023-07-24 10:36:45 +08:00
xiekaidong
13754e2505 更新资源和资源检查 2023-07-20 21:51:04 +08:00
xiekaidong
ed0e82f254 上传资源 2023-07-19 20:17:00 +08:00
xiekaidong
0f6ae346b8 武器副本的一些界面 2023-07-19 16:52:39 +08:00
xiekaidong
24ca5afc0b 通用扫荡弹窗 2023-07-19 10:39:28 +08:00
xiekaidong
e979f97f20 一些界面 2023-07-18 20:59:57 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
CloudJ
e7fd259f13 针对泰语调整 2023-07-06 20:15:09 +08:00
CloudJ
fecad6fb58 针对泰语调整 2023-07-06 20:14:18 +08:00
Fang
404575894e 多语言超框 2023-07-06 19:08:39 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00