Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
xiekaidong
|
3b61c03934
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# Assets/lua/app/common/local_data.lua.bytes
# Assets/lua/app/config/act_gift.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/const.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/cn/buff.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/de/item.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/fr/item.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/ru/item.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill.lua.bytes
# Assets/lua/app/global/global_func.lua.bytes
# Assets/lua/app/module/arena/arena_manager.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/equip/equip_manager.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
# Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
# Assets/lua/app/ui/ui_manager.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-08 15:59:22 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
Fang
|
644e83d710
|
道具获取的头像品质颜色错误fix
|
2023-08-01 10:28:55 +08:00 |
|
Fang
|
a8b82718d0
|
1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名
|
2023-07-28 18:05:35 +08:00 |
|
Fang
|
be4846e7b9
|
抽卡界面不展示装备升级红点
|
2023-07-28 12:05:53 +08:00 |
|
xiekaidong
|
fb4140d219
|
增加容错
|
2023-07-28 10:49:49 +08:00 |
|
Fang
|
75e63b9685
|
红点修改
|
2023-07-27 12:03:11 +08:00 |
|
Fang
|
9bc06371fb
|
编译
|
2023-07-26 18:23:37 +08:00 |
|
Fang
|
e31bf25fa3
|
装备红点、文案
|
2023-07-26 15:16:01 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
66d69032e6
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:16:26 +08:00 |
|
Fang
|
02da483630
|
装备升级材料获取
|
2023-07-21 09:51:28 +08:00 |
|
xiekaidong
|
61336e5d6c
|
编译lua
|
2023-07-19 20:24:13 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
Fang
|
44ee6c0d52
|
添加头像、头像框道具解锁逻辑
|
2023-07-07 11:05:29 +08:00 |
|
xiekaidong
|
6ac555593c
|
引导处理一下
|
2023-07-05 21:59:04 +08:00 |
|
Fang
|
efe355a0c4
|
完善细节
|
2023-07-03 18:35:49 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
chenxi
|
622d9918d3
|
ab name
|
2023-06-20 14:32:36 +08:00 |
|
Fang
|
0d624772e7
|
添加头像背景品质
|
2023-06-20 14:23:48 +08:00 |
|
Fang
|
7939d1630d
|
跨天关闭副本关卡选择界面
|
2023-06-19 16:00:11 +08:00 |
|
Fang
|
dfa698542b
|
玩家头像抽象成独立cell
|
2023-06-19 14:59:02 +08:00 |
|
CloudJ
|
ade6fd169a
|
编译
|
2023-06-06 10:22:05 +08:00 |
|
Fang
|
0216eabf3b
|
战斗结算界面动画
|
2023-06-05 17:17:26 +08:00 |
|
CloudJ
|
57b4d1064f
|
编译
|
2023-06-05 16:51:17 +08:00 |
|
chenxi
|
3739698944
|
替换界面
|
2023-06-05 15:51:13 +08:00 |
|
chenxi
|
6c7fecc0ce
|
英雄icon大小
|
2023-06-02 21:04:03 +08:00 |
|
CloudJ
|
3b8bf3106a
|
编译
|
2023-06-02 19:59:29 +08:00 |
|
xiekaidong
|
d391f68779
|
显示问题
|
2023-05-31 14:30:41 +08:00 |
|
chenxi
|
5eaa1f2f73
|
编译
|
2023-05-29 15:22:21 +08:00 |
|
chenxi
|
706fec62f4
|
奖励图标
|
2023-05-26 18:48:02 +08:00 |
|
chenxi
|
049900685c
|
调整英雄头像
|
2023-05-26 18:17:37 +08:00 |
|
chenxi
|
d2b296fe95
|
宝箱tips
|
2023-05-19 16:37:44 +08:00 |
|
chenxi
|
bcdbcec1db
|
编译
|
2023-05-18 22:11:58 +08:00 |
|
xiekaidong
|
fff1c9260e
|
宝箱
|
2023-05-17 19:20:18 +08:00 |
|
chenxi
|
f2622a2ae2
|
tips
|
2023-05-17 19:05:57 +08:00 |
|
chenxi
|
e5cf6e09bf
|
战令
|
2023-05-15 21:34:02 +08:00 |
|
xiekaidong
|
33cad880c9
|
联网
|
2023-05-08 11:03:17 +08:00 |
|
xiekaidong
|
2c7f63baeb
|
bug修复
|
2023-04-26 18:40:05 +08:00 |
|
chenxi
|
cc2dc24479
|
编译
|
2023-04-25 12:09:30 +08:00 |
|
xiekaidong
|
a849c21af9
|
一些spine
|
2023-04-24 15:50:14 +08:00 |
|
xiekaidong
|
b1835f1da3
|
优化排序
|
2023-04-23 12:08:00 +08:00 |
|
chenxi
|
7354b90491
|
编译
|
2023-04-21 23:33:09 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
xiekaidong
|
2311761568
|
表现修改
|
2023-04-21 21:03:21 +08:00 |
|
xiekaidong
|
e4fe7b4882
|
关卡数据容错
|
2023-04-21 09:57:02 +08:00 |
|
chenxi
|
a065253b43
|
编译
|
2023-04-20 22:42:51 +08:00 |
|
chenxi
|
6991dd2d36
|
伤害
|
2023-04-20 19:04:56 +08:00 |
|