1092 Commits

Author SHA1 Message Date
xiekaidong
2ac0456b2f 复活判定 2023-08-15 17:33:50 +08:00
Fang
3b4a03cde8 多语言遮挡处理 2023-08-15 16:17:49 +08:00
Fang
be4c77474e 显示fix 2023-08-15 15:35:02 +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
xiekaidong
c438b6fbd3 战斗任务统计 2023-08-15 12:15:43 +08:00
xiekaidong
c4d52097e8 bug修复 2023-08-15 11:52:02 +08:00
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
Fang
212c93632b 活动等级达到最大报错fix 2023-08-15 10:28:42 +08:00
xiekaidong
9cdeac081d 编译lua 2023-08-15 09:38:22 +08:00
xiekaidong
200ebe808b 技能位置 2023-08-15 09:22:18 +08:00
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
Fang
662fd60a54 报错fix 2023-08-14 18:40:53 +08:00
Fang
566ac2d369 容错、导表 2023-08-14 18:33:10 +08:00
Fang
ac48fb604e 编译 2023-08-14 17:49:40 +08:00
xiekaidong
9641889e5d 重生处理 2023-08-14 16:29:01 +08:00
Fang
6e9b10e7a3 容错处理 2023-08-14 16:13:42 +08:00
xiekaidong
cbce761a98 竞技场弹出礼包界面 2023-08-14 14:52:58 +08:00
xiekaidong
93787e2194 初始化刘海屏 2023-08-14 14:46:02 +08:00
Fang
0531830c75 配置更新 2023-08-14 14:44:04 +08:00
Fang
a4c6fb8e38 英雄生命值显示fix、资源替换 2023-08-14 11:15:06 +08:00
Fang
7dd9c5e88a 夏日活动战令购买spine动画调换 2023-08-14 09:58:52 +08:00
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
Fang
5f53448c75 新加颜色生命值加成 2023-08-11 18:16:16 +08:00
xiekaidong
353b6186a3 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-11 17:50:34 +08:00
xiekaidong
80fd0f2e80 bug修复 2023-08-11 17:50:30 +08:00
Fang
d8c5fb61a3 资源替换 2023-08-11 17:02:46 +08:00
Fang
78fac50fc5 装备副本界面添加礼包入口 2023-08-11 16:35:21 +08:00
Fang
30bf431636 编译 2023-08-11 16:03:20 +08:00
Fang
302452e76d 竞技场宝箱弹出优化、bugfix 2023-08-11 15:50:38 +08:00
xiekaidong
187eda1f35 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
2023-08-11 15:18:03 +08:00
xiekaidong
62907b1a83 边缘障碍物逻辑优化 2023-08-11 15:17:49 +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
d93593b5fb 优化木棍障碍物 2023-08-11 11:25:22 +08:00
xiekaidong
425bfe2fd7 更新配置 2023-08-11 10:41:28 +08:00
xiekaidong
8031fd83f8 bug修复 2023-08-11 10:05:57 +08:00
xiekaidong
b08ab375cc bug修复 2023-08-10 19:29:42 +08:00
Fang
1aef3a423a 皮肤属性增加生命加成显示 2023-08-10 16:32:10 +08:00
xiekaidong
77788ca22e bug修复 2023-08-10 11:45:35 +08:00
xiekaidong
53e9da7a4f 皮肤技能表现 2023-08-10 10:49:22 +08:00
xiekaidong
5c1fa9be63 更新配置 2023-08-10 09:41:33 +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
fadd825990 更新协议 2023-08-09 17:34:50 +08:00
Fang
591784bef1 更表 2023-08-09 17:25:52 +08:00
xiekaidong
30b58e0e39 删除打印 2023-08-09 16:51:27 +08:00
Fang
704fc389cb 替图、编译 2023-08-09 16:48:39 +08:00
xiekaidong
7a20bfb816 编译lua 2023-08-09 16:17:58 +08:00