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 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
chenxi
|
818cef2b0f
|
英雄详情界面
|
2023-06-05 18:53:25 +08:00 |
|
CloudJ
|
8a387c0ac9
|
UI调整
|
2023-06-05 16:59:04 +08:00 |
|
chenxi
|
3739698944
|
替换界面
|
2023-06-05 15:51:13 +08:00 |
|
chenxi
|
4582299d87
|
英雄展示界面
|
2023-06-05 10:24:53 +08:00 |
|
chenxi
|
d4b5e843f0
|
资源自动修复
|
2023-06-05 10:05:44 +08:00 |
|
chenxi
|
900bea3586
|
英雄列表界面
|
2023-06-03 19:59:22 +08:00 |
|
chenxi
|
0270759629
|
调整界面
|
2023-06-02 21:23:00 +08:00 |
|
chenxi
|
ad926adcb5
|
调整ui
|
2023-06-02 17:07:26 +08:00 |
|
chenxi
|
570af5a807
|
替换界面
|
2023-06-01 22:12:22 +08:00 |
|
chenxi
|
38d123eb73
|
英雄界面滑动区域
|
2023-06-01 18:34:03 +08:00 |
|
chenxi
|
a58c63a617
|
ab name
|
2023-05-30 21:15:29 +08:00 |
|
chenxi
|
7af6800ea0
|
功能解锁弹窗
|
2023-05-30 15:33:46 +08:00 |
|
chenxi
|
02b776eaf9
|
英雄解锁
|
2023-05-30 12:17:31 +08:00 |
|
chenxi
|
b1d4cc7728
|
英雄解锁界面
|
2023-05-30 10:18:57 +08:00 |
|
chenxi
|
3b47c0dc1a
|
编译
|
2023-05-23 19:03:11 +08:00 |
|
chenxi
|
db92c0bb37
|
英雄详情界面
|
2023-05-23 18:42:04 +08:00 |
|
xiekaidong
|
7104d85f77
|
层级调整
|
2023-05-08 14:17:44 +08:00 |
|
xiekaidong
|
b78493fc7a
|
修复一些bug
|
2023-04-24 20:18:32 +08:00 |
|