xiekaidong
|
eb1a197cc0
|
Merge branch 'master' into dev_20230829
# Conflicts:
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
|
2023-08-29 16:02:44 +08:00 |
|
xiekaidong
|
a6665b8fc3
|
bug修复
|
2023-08-28 19:15:19 +08:00 |
|
xiekaidong
|
66bf185bd7
|
每日任务宝箱动画
|
2023-08-28 18:56:35 +08:00 |
|
Fang
|
ec67afe68b
|
竞技场入口红点添加段位奖励可领取情况
|
2023-08-28 18:19:26 +08:00 |
|
Fang
|
c1af1c8dcf
|
段位奖励第一个档位标签显示fix
|
2023-08-28 17:51:20 +08:00 |
|
Fang
|
7f99b9d771
|
装备礼包fix
|
2023-08-28 15:26:21 +08:00 |
|
Fang
|
efd26331b4
|
档位奖励进度显示fix
|
2023-08-28 10:15:37 +08:00 |
|
Fang
|
b460d9d8c5
|
段位奖励段位图标显示修改
|
2023-08-25 10:36:35 +08:00 |
|
xiekaidong
|
5bffd844c1
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
|
2023-08-24 18:26:12 +08:00 |
|
xiekaidong
|
0ec05b592c
|
更改基金开启时间
|
2023-08-24 18:26:03 +08:00 |
|
陈希
|
ca7f897efe
|
Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包
See merge request b6-client/b6-unity!15
|
2023-08-24 10:24:23 +00:00 |
|
Fang
|
2b11c3a6b0
|
定时器处理
|
2023-08-24 18:21:22 +08:00 |
|
Fang
|
be98aa91d8
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:55 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
xiekaidong
|
bd50d89651
|
解锁判定
|
2023-08-22 18:09:31 +08:00 |
|
xiekaidong
|
5d5606c887
|
排序
|
2023-08-22 17:48:18 +08:00 |
|
xiekaidong
|
713c7b8f87
|
bug修复
|
2023-08-21 10:33:37 +08:00 |
|
xiekaidong
|
7134e96cc8
|
Merge branch 'master' into dev_20230829
# Conflicts:
# Assets/lua/app/common/event_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-21 09:47:38 +08:00 |
|
xiekaidong
|
0f64030d8e
|
报错修复
|
2023-08-21 09:47:13 +08:00 |
|
xiekaidong
|
deae480ef3
|
诅咒回血被腐败影响
|
2023-08-18 18:56:09 +08:00 |
|
xiekaidong
|
033c2e8d63
|
英雄基金
|
2023-08-18 18:10:12 +08:00 |
|
xiekaidong
|
3ace779c74
|
一些优化和容错
|
2023-08-18 10:56:29 +08:00 |
|
Fang
|
eb6a23021e
|
编译
|
2023-08-17 19:09:41 +08:00 |
|
Fang
|
0a5e37baa3
|
优化夏日活动请求
|
2023-08-17 14:06:58 +08:00 |
|
xiekaidong
|
60a2c2ee3a
|
战令一键领取
|
2023-08-16 17:36:18 +08:00 |
|
Fang
|
a6cda907f0
|
头像、头像框道具解锁优化
|
2023-08-16 11:52:53 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
f1d34124b7
|
审核处理
|
2023-08-15 21:25:23 +08:00 |
|
Fang
|
1e7440d170
|
夏日活动上报
|
2023-08-15 20:32:37 +08:00 |
|
Fang
|
acf5e29ae1
|
bug fix
|
2023-08-15 15:08:35 +08:00 |
|
xiekaidong
|
4d1635dc3b
|
背景特效
|
2023-08-15 14:59:48 +08:00 |
|
Fang
|
335ab77238
|
竞技场皮肤属性完善
|
2023-08-15 12:20:55 +08:00 |
|
Fang
|
212c93632b
|
活动等级达到最大报错fix
|
2023-08-15 10:28:42 +08:00 |
|
xiekaidong
|
200ebe808b
|
技能位置
|
2023-08-15 09:22:18 +08:00 |
|
Fang
|
662fd60a54
|
报错fix
|
2023-08-14 18:40:53 +08:00 |
|
Fang
|
566ac2d369
|
容错、导表
|
2023-08-14 18:33:10 +08:00 |
|
xiekaidong
|
9641889e5d
|
重生处理
|
2023-08-14 16:29:01 +08:00 |
|
Fang
|
6e9b10e7a3
|
容错处理
|
2023-08-14 16:13:42 +08:00 |
|
Fang
|
a4c6fb8e38
|
英雄生命值显示fix、资源替换
|
2023-08-14 11:15:06 +08:00 |
|
Fang
|
302452e76d
|
竞技场宝箱弹出优化、bugfix
|
2023-08-11 15:50:38 +08:00 |
|
Fang
|
d88a18d48b
|
活动礼包弹出逻辑补充
|
2023-08-11 15:09:15 +08:00 |
|
Fang
|
0fda6326b4
|
编译
|
2023-08-11 14:28:01 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
xiekaidong
|
425bfe2fd7
|
更新配置
|
2023-08-11 10:41:28 +08:00 |
|
xiekaidong
|
b08ab375cc
|
bug修复
|
2023-08-10 19:29:42 +08:00 |
|
xiekaidong
|
53e9da7a4f
|
皮肤技能表现
|
2023-08-10 10:49:22 +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 |
|
Fang
|
591784bef1
|
更表
|
2023-08-09 17:25:52 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|