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 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
8f360a86c7
|
bug修复
|
2023-07-25 21:19:01 +08:00 |
|
xiekaidong
|
4cc90051a4
|
韩国社区跳转处理
|
2023-07-25 16:06:17 +08:00 |
|
xiekaidong
|
a89f9ed725
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 21:48:07 +08:00 |
|
xiekaidong
|
2aaf6afd0c
|
优化
|
2023-07-24 21:48:04 +08:00 |
|
Fang
|
f821a6e6d1
|
显示fix
|
2023-07-24 21:39:48 +08:00 |
|
xiekaidong
|
0a7c4c5170
|
bug修复
|
2023-07-24 20:55:03 +08:00 |
|
xiekaidong
|
3cfb991ee9
|
调整一下逻辑
|
2023-07-24 18:48:04 +08:00 |
|
xiekaidong
|
b4ddfb7945
|
一些报错修复
|
2023-07-24 18:32:51 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
Fang
|
6b52dc9f1d
|
支线基金
|
2023-07-24 11:54:43 +08:00 |
|
xiekaidong
|
fb8aee8370
|
新增道具宝箱显示
|
2023-07-24 11:18:48 +08:00 |
|
xiekaidong
|
66d69032e6
|
英雄属性bug修复，查看其他玩家信息时带入装备信息
|
2023-07-22 18:16:26 +08:00 |
|
xiekaidong
|
2bb3d99058
|
伤害公式bug修复
|
2023-07-21 17:47:07 +08:00 |
|
xiekaidong
|
5cb6ae349b
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:27 +08:00 |
|
xiekaidong
|
b38cc4acca
|
新增buff和叠加方式优化
|
2023-07-21 14:40:39 +08:00 |
|
xiekaidong
|
ef7fed0faa
|
buff机制修改
|
2023-07-21 11:39:02 +08:00 |
|