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 |
|
xiekaidong
|
56abe8a87b
|
添加打印
|
2023-08-09 16:03:28 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
Fang
|
a6288069d8
|
装备礼包弹出fix
|
2023-08-09 10:58:45 +08:00 |
|
xiekaidong
|
bcb726187e
|
bug修复
|
2023-08-09 10:26:58 +08:00 |
|
xiekaidong
|
519bda505a
|
金猪
|
2023-08-09 10:21:52 +08:00 |
|
Fang
|
d3dbfd0b51
|
1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:20:31 +08:00 |
|
xiekaidong
|
cb2c2669c2
|
bug修复
|
2023-08-08 18:10:34 +08:00 |
|
xiekaidong
|
373e5c22cc
|
反伤bug修复
|
2023-08-08 17:49:23 +08:00 |
|
xiekaidong
|
f7dcecd348
|
排序
|
2023-08-08 16:56:19 +08:00 |
|
xiekaidong
|
ce7ad3cb8c
|
新buff和新机制
|
2023-08-08 16:39:03 +08:00 |
|
xiekaidong
|
433ec88ba1
|
编译lua
|
2023-08-08 16:00:08 +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
|
dff0b5b08a
|
更新配置
|
2023-08-08 11:44:40 +08:00 |
|
xiekaidong
|
d43dd92f9e
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/ui/hero/armor_info_comp.lua.bytes
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
# Assets/lua/app/userdata/player/player_data.lua.bytes
# Assets/lua/app/userdata/shop/shop_data.lua.bytes
|
2023-08-08 11:42:31 +08:00 |
|
xiekaidong
|
bad1e2f2e6
|
新增上报
|
2023-08-07 18:15:55 +08:00 |
|