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 |
|
xiekaidong
|
b92c978aad
|
字段修改
|
2023-08-07 15:51:08 +08:00 |
|
xiekaidong
|
654a94eab9
|
编译lua
|
2023-08-07 15:33:52 +08:00 |
|
xiekaidong
|
607c8d3eb6
|
增加上报属性
|
2023-08-07 10:35:37 +08:00 |
|
xiekaidong
|
f52b02b929
|
优化显示
|
2023-08-07 09:37:13 +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
|
d26fe6cfa2
|
显示修复
|
2023-08-04 15:17:46 +08:00 |
|
xiekaidong
|
56882aaa7e
|
bug修复
|
2023-08-04 15:16:45 +08:00 |
|
xiekaidong
|
a8064bb578
|
棋盘机制调整
|
2023-08-04 14:24:13 +08:00 |
|
xiekaidong
|
a108907fe1
|
显示bug修复
|
2023-08-04 11:34:10 +08:00 |
|
Fang
|
e79f3ea767
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:22 +08:00 |
|
xiekaidong
|
5817c99a36
|
付费项上报异常问题修复
|
2023-08-03 18:10:48 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
xiekaidong
|
80bb50137a
|
bug修复
|
2023-08-03 16:53:57 +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
|
d24f52825e
|
Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-unity into dev_20230809
|
2023-08-03 10:24:48 +08:00 |
|
xiekaidong
|
d312e42fac
|
优化局内技能显示
|
2023-08-03 10:24:45 +08:00 |
|
Fang
|
6fabe5b071
|
资源副本扫荡不关闭关卡界面
|
2023-08-03 10:09:36 +08:00 |
|
xiekaidong
|
856132179a
|
显示bug修复
|
2023-08-03 09:47:41 +08:00 |
|
xiekaidong
|
93bd2796b6
|
战斗血条优化
|
2023-08-02 20:34:37 +08:00 |
|
xiekaidong
|
0d12f8ccbc
|
更新配置
|
2023-08-02 19:55:50 +08:00 |
|
xiekaidong
|
7b8177d69e
|
优化显示
|
2023-08-02 18:56:50 +08:00 |
|
xiekaidong
|
410cc6b903
|
优化显示逻辑
|
2023-08-02 18:47:41 +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
|
999d62cdbd
|
bug修复
|
2023-08-01 18:21:00 +08:00 |
|
Fang
|
694f7eb10b
|
增加优惠入口红点逻辑
|
2023-08-01 18:20:08 +08:00 |
|
xiekaidong
|
fa42e29552
|
续关记录能量
|
2023-08-01 18:03:38 +08:00 |
|
xiekaidong
|
31a57fddc6
|
技能机制优化
|
2023-08-01 17:39:15 +08:00 |
|