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 |
|
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 |
|
xiekaidong
|
654a94eab9
|
编译lua
|
2023-08-07 15:33:52 +08:00 |
|
xiekaidong
|
607c8d3eb6
|
增加上报属性
|
2023-08-07 10:35:37 +08:00 |
|
xiekaidong
|
dd1a91051a
|
bug修复
|
2023-08-04 16:59:30 +08:00 |
|
xiekaidong
|
51d857b64e
|
新增两个反伤护盾
|
2023-08-04 16:35:56 +08:00 |
|
Fang
|
8e8320a307
|
礼包界面展示冲突处理
|
2023-08-04 16:00:17 +08:00 |
|
xiekaidong
|
56882aaa7e
|
bug修复
|
2023-08-04 15:16:45 +08:00 |
|
xiekaidong
|
a8064bb578
|
棋盘机制调整
|
2023-08-04 14:24:13 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
xiekaidong
|
22b6a4092a
|
bug
|
2023-08-03 16:24:06 +08:00 |
|
xiekaidong
|
e0a51b64ba
|
bug'修复
|
2023-08-03 16:10:15 +08:00 |
|
xiekaidong
|
cd5f588a66
|
统一接口，金币不足提示弹窗询问
|
2023-08-03 14:54:55 +08:00 |
|
xiekaidong
|
8be0258270
|
日志上报
|
2023-08-03 14:20:41 +08:00 |
|
xiekaidong
|
8de4c3340b
|
武器副本增加体力消耗
|
2023-08-03 11:08:40 +08:00 |
|
xiekaidong
|
856132179a
|
显示bug修复
|
2023-08-03 09:47:41 +08:00 |
|
xiekaidong
|
93bd2796b6
|
战斗血条优化
|
2023-08-02 20:34:37 +08:00 |
|
xiekaidong
|
7b8177d69e
|
优化显示
|
2023-08-02 18:56:50 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
936fb7c24e
|
木兰试玩增加至第五章
|
2023-08-02 16:14:24 +08:00 |
|
xiekaidong
|
ec2b16aff1
|
反击问题
|
2023-08-01 18:34:48 +08:00 |
|
xiekaidong
|
fa42e29552
|
续关记录能量
|
2023-08-01 18:03:38 +08:00 |
|
xiekaidong
|
31a57fddc6
|
技能机制优化
|
2023-08-01 17:39:15 +08:00 |
|
Fang
|
6f13ff7f87
|
添加音效
|
2023-08-01 11:11:29 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
Fang
|
74dec91e6d
|
技能tips
|
2023-07-28 11:46:58 +08:00 |
|
xiekaidong
|
e6858a8eee
|
邮件拉去增加一个随机延时
|
2023-07-28 11:18:01 +08:00 |
|
xiekaidong
|
1c967bd864
|
刷新界面
|
2023-07-25 23:41:42 +08:00 |
|