xiekaidong
|
8bcf0d01e2
|
封号功能和屏蔽一些网络冗余操作
|
2023-08-28 14:04:56 +08:00 |
|
xiekaidong
|
c7b4a4a064
|
bug修复
|
2023-08-28 11:12:32 +08:00 |
|
Fang
|
2b11c3a6b0
|
定时器处理
|
2023-08-24 18:21:22 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
Fang
|
519480c7dd
|
新增皮肤报错fix
|
2023-08-22 11:57:00 +08:00 |
|
xiekaidong
|
9b4ab7f785
|
bug修复
|
2023-08-21 11:24:57 +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
|
deae480ef3
|
诅咒回血被腐败影响
|
2023-08-18 18:56:09 +08:00 |
|
xiekaidong
|
033c2e8d63
|
英雄基金
|
2023-08-18 18:10:12 +08:00 |
|
xiekaidong
|
06797a20de
|
选技能buf修复
|
2023-08-18 11:45:05 +08:00 |
|
xiekaidong
|
3ace779c74
|
一些优化和容错
|
2023-08-18 10:56:29 +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
|
16d8c0e858
|
夏日活动上报修改
|
2023-08-15 20:40:46 +08:00 |
|
Fang
|
1e7440d170
|
夏日活动上报
|
2023-08-15 20:32:37 +08:00 |
|
xiekaidong
|
4b49a99d8f
|
容错和容错
|
2023-08-15 19:34:30 +08:00 |
|
xiekaidong
|
2ac0456b2f
|
复活判定
|
2023-08-15 17:33:50 +08:00 |
|
Fang
|
acf5e29ae1
|
bug fix
|
2023-08-15 15:08:35 +08:00 |
|
xiekaidong
|
4d1635dc3b
|
背景特效
|
2023-08-15 14:59:48 +08:00 |
|
xiekaidong
|
c438b6fbd3
|
战斗任务统计
|
2023-08-15 12:15:43 +08:00 |
|
xiekaidong
|
c4d52097e8
|
bug修复
|
2023-08-15 11:52:02 +08:00 |
|
xiekaidong
|
9cdeac081d
|
编译lua
|
2023-08-15 09:38:22 +08:00 |
|
Fang
|
f788462596
|
皮肤道具点开界面
|
2023-08-14 19:35:04 +08:00 |
|
xiekaidong
|
9641889e5d
|
重生处理
|
2023-08-14 16:29:01 +08:00 |
|
Fang
|
0531830c75
|
配置更新
|
2023-08-14 14:44:04 +08:00 |
|
Fang
|
a4c6fb8e38
|
英雄生命值显示fix、资源替换
|
2023-08-14 11:15:06 +08:00 |
|
Fang
|
5f53448c75
|
新加颜色生命值加成
|
2023-08-11 18:16:16 +08:00 |
|
xiekaidong
|
80fd0f2e80
|
bug修复
|
2023-08-11 17:50:30 +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
|
8031fd83f8
|
bug修复
|
2023-08-11 10:05:57 +08:00 |
|
xiekaidong
|
77788ca22e
|
bug修复
|
2023-08-10 11:45:35 +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 |
|
xiekaidong
|
56abe8a87b
|
添加打印
|
2023-08-09 16:03:28 +08:00 |
|
Fang
|
9c9cde6a89
|
皮肤功能
|
2023-08-09 14:15:12 +08:00 |
|
Fang
|
d3dbfd0b51
|
1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:20:31 +08:00 |
|
xiekaidong
|
373e5c22cc
|
反伤bug修复
|
2023-08-08 17:49:23 +08:00 |
|