139 Commits

Author SHA1 Message Date
puxuan
0223007bc4 star 2025-06-22 19:06:10 +08:00
puxuan
4cb91d9c95 升星 2025-05-27 00:08:50 +08:00
puxuan
e346e7146e hero 2025-05-25 23:34:19 +08:00
puxuan
7718bc4ab0 英雄基础数据 2025-05-25 19:22:07 +08:00
puxuan
5f87e1e817 hero 2025-05-24 23:49:57 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
Fang
4f9e75da7a 显示fix 2023-09-20 16:52:02 +08:00
Fang
22a2bb1a5e 新号圆月活动请求fix、符文材料个数显示修改 2023-09-19 20:53:05 +08:00
Fang
f40b937012 更表、超框处理 2023-09-19 18:31:31 +08:00
Fang
299b03213f 1 2023-09-19 10:44:56 +08:00
Fang
6266224727 预制体修改 2023-09-19 10:42:33 +08:00
Fang
e4b953c193 导入资源 2023-09-19 10:40:16 +08:00
xiekaidong
03956d8ecb 资源检查 2023-09-19 09:52:01 +08:00
Fang
37ec3978b5 fix 2023-09-18 18:40:27 +08:00
Fang
448aa0659e 符文自动淬炼修改、特效完善 2023-09-18 14:57:00 +08:00
Fang
f409368faa bug fix 2023-09-13 15:45:27 +08:00
Fang
0a231c3f94 自动铸造开启等级 2023-09-13 11:03:18 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
3527846c69 资源检查 2023-08-15 19:51:06 +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
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
xiekaidong
977b3c8c91 Merge branch 'master' into dev_20230815
# Conflicts:
#	Assets/lua/app/config/arena_bounty_level.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/avatar_frame.lua.bytes
#	Assets/lua/app/config/chapter.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/grid_type.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/monster_chapter.lua.bytes
#	Assets/lua/app/config/monster_daily_challenge.lua.bytes
#	Assets/lua/app/config/monster_dungeon_armor.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/en/avatar.lua.bytes
#	Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/es/avatar.lua.bytes
#	Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/id/avatar.lua.bytes
#	Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/th/avatar.lua.bytes
#	Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
#	Assets/lua/app/config/summon.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/battle/team/battle_team.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
2023-08-10 09:38:07 +08:00
xiekaidong
f0c490b2ca 资源检查 2023-08-09 17:00:39 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
Fang
74dec91e6d 技能tips 2023-07-28 11:46:58 +08:00
xiekaidong
b74826ee90 更新配置 2023-07-27 10:28:08 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
57867145a4 显示优化 2023-07-26 11:48:07 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
2104d20eed 资源检查 2023-07-25 22:06:48 +08:00
Fang
298a77cb44 显示修复、导入特效文件 2023-07-25 21:02:08 +08:00
Fang
5cff8c0e57 超框、修复报错 2023-07-25 16:33:15 +08:00
Fang
4d508ec53d 1 2023-07-25 15:45:52 +08:00
Fang
7879d441bd 道具获取扫荡文案修改、武器界面加anim组件 2023-07-24 15:59:13 +08:00
Fang
704dac4fa7 礼包资源上传、bug_fix 2023-07-24 15:13:32 +08:00
Fang
d5c0fb562f bug fix 2023-07-24 14:37:35 +08:00
Fang
6b52dc9f1d 支线基金 2023-07-24 11:54:43 +08:00
xiekaidong
13754e2505 更新资源和资源检查 2023-07-20 21:51:04 +08:00
Fang
047f17e6f3 装备系统 2023-07-20 19:35:17 +08:00
Fang
2101a422bb 英雄图鉴 2023-07-14 17:08:08 +08:00
Fang
82c3dba141 火旺你又超框 2023-07-07 14:16:04 +08:00
Fang
18c7c1557d 超框 2023-07-07 12:03:57 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
Fang
7c79623e92 超框处理 2023-06-20 18:43:08 +08:00
xiekaidong
5938486e5b bug修复 2023-06-20 18:09:54 +08:00
chenxi
7a82aff2db 界面调整 2023-06-16 17:36:27 +08:00