95 Commits

Author SHA1 Message Date
puxuan
1c96c3a82f fix bug 2025-10-15 20:39:32 +08:00
puxuan
f75e0fccf6 装备红点 2025-10-13 12:02:26 +08:00
puxuan
d527822974 装备 2025-10-11 15:48:03 +08:00
puxuan
e32c238a90 副本 2025-10-10 19:22:45 +08:00
puxuan
a3771c610b 升级 2025-10-09 17:29:10 +08:00
puxuan
8060568ced 签到 2025-10-07 17:19:46 +08:00
puxuan
c819d7ce8a 礼包 2025-09-29 21:10:50 +08:00
puxuan
83f941496d 装备 2025-09-17 17:24:03 +08:00
puxuan
03cf4e1843 装备 2025-09-12 09:50:57 +08:00
puxuan
f4f0111fa9 装备 2025-09-09 19:40:07 +08:00
puxuan
15f7e7eaf0 背包 2025-09-08 20:02:09 +08:00
puxuan
f11022dc96 背包 2025-09-08 17:36:27 +08:00
puxuan
6b828c55c0 fix bug 2025-09-03 19:58:45 +08:00
puxuan
80edb5a22f fix bug 2025-09-03 16:51:55 +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
ecd5958b55 fix bug 2025-08-20 15:57:02 +08:00
puxuan
5fbf156762 英雄 2025-08-20 11:43:19 +08:00
puxuan
c2d8f2f894 天赋 2025-08-04 11:44:25 +08:00
puxuan
7db28b8e49 arena 2025-07-21 21:05:32 +08:00
puxuan
94227802b4 arena 2025-07-15 20:59:15 +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
a77df017d7 hero 2025-05-28 00:21:24 +08:00
puxuan
4cb91d9c95 升星 2025-05-27 00:08:50 +08:00
puxuan
e346e7146e hero 2025-05-25 23:34:19 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
Fang
332789283b 点击英雄卡面,不显示皮肤fix 2023-08-31 18:10:26 +08:00
Fang
667e9dbe11 更换皮肤卡面变化 2023-08-30 17:32:14 +08:00
Fang
79f1369068 加载资源优化 2023-08-29 17:11:49 +08:00
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +08:00
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