Fang
|
ba449382a9
|
细节完善
|
2023-08-11 14:26:52 +08:00 |
|
陈希
|
78c18dac68
|
Merge branch 'fang/夏日活动' into 'dev_20230815'
夏日活动
See merge request b6-client/b6-lua!11
|
2023-08-11 04:06:02 +00:00 |
|
xiekaidong
|
213e82f2c1
|
优化逻辑
|
2023-08-11 11:59:47 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
xiekaidong
|
f5ed280271
|
优化木棍障碍物
|
2023-08-11 11:24:52 +08:00 |
|
xiekaidong
|
4c65578099
|
更新配置
|
2023-08-11 10:41:09 +08:00 |
|
xiekaidong
|
0d979c5275
|
bug修复
|
2023-08-11 10:05:28 +08:00 |
|
xiekaidong
|
9c8b20f1fb
|
bug修复
|
2023-08-10 19:27:48 +08:00 |
|
xiekaidong
|
5eff2c3633
|
上报和容错
|
2023-08-10 18:41:24 +08:00 |
|
xiekaidong
|
84f22f6123
|
bug修复
v.1.1.8_android
v.1.2.8_ios
|
2023-08-10 17:33:30 +08:00 |
|
Fang
|
8c88139a09
|
皮肤属性增加生命加成显示
|
2023-08-10 16:31:25 +08:00 |
|
xiekaidong
|
aca97b775e
|
bug修复
|
2023-08-10 16:27:36 +08:00 |
|
xiekaidong
|
18d447de17
|
名称修改
|
2023-08-10 11:56:45 +08:00 |
|
xiekaidong
|
04a2694461
|
bug修复
|
2023-08-10 11:45:16 +08:00 |
|
xiekaidong
|
5b8030552d
|
皮肤技能表现
|
2023-08-10 10:48:30 +08:00 |
|
xiekaidong
|
e17c9bf4cf
|
更新配置
|
2023-08-10 09:40:35 +08:00 |
|
xiekaidong
|
d311ea14aa
|
Merge branch 'master' into dev_20230815
# Conflicts:
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board.lua
# lua/app/config/grid_type.lua
# lua/app/config/strings/cn/avatar.lua
# lua/app/config/strings/cn/avatar_frame.lua
# lua/app/config/strings/en/avatar.lua
# lua/app/config/strings/en/avatar_frame.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/avatar.lua
# lua/app/config/strings/es/avatar_frame.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/id/avatar.lua
# lua/app/config/strings/id/avatar_frame.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/avatar.lua
# lua/app/config/strings/ja/avatar_frame.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ko/avatar.lua
# lua/app/config/strings/ko/avatar_frame.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/avatar.lua
# lua/app/config/strings/pt/avatar_frame.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/th/avatar.lua
# lua/app/config/strings/th/avatar_frame.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/avatar.lua
# lua/app/config/strings/vi/avatar_frame.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/avatar.lua
# lua/app/config/strings/zh/avatar_frame.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/summon.lua
# lua/app/module/battle/component/battle_unit_comp.lua
# lua/app/module/battle/team/battle_team.lua
|
2023-08-10 09:39:07 +08:00 |
|
Fang
|
260b299f08
|
协议更新
v.1.1.7_android
v.1.2.7_ios
|
2023-08-09 17:34:16 +08:00 |
|
xiekaidong
|
efc8aa3dde
|
延迟提高一点
|
2023-08-09 17:32:57 +08:00 |
|
Fang
|
0e71260aad
|
更表
|
2023-08-09 17:25:38 +08:00 |
|
xiekaidong
|
1ecb11124d
|
补充
|
2023-08-09 17:18:14 +08:00 |
|
xiekaidong
|
e8ad813399
|
删除打印
|
2023-08-09 16:50:39 +08:00 |
|
Fang
|
6de4b6dbc4
|
Merge branch 'fang/皮肤' into dev_20230815
|
2023-08-09 16:47:20 +08:00 |
|
Fang
|
d4aaf40b55
|
皮肤收集不需要帮助按钮
|
2023-08-09 16:47:03 +08:00 |
|
xiekaidong
|
996f3deeee
|
添加打印
|
2023-08-09 16:21:12 +08:00 |
|
陈希
|
8f37945b1e
|
Merge branch 'fang/皮肤' into 'dev_20230815'
皮肤功能
See merge request b6-client/b6-lua!10
|
2023-08-09 07:28:08 +00:00 |
|
Fang
|
9c42fe1da6
|
皮肤功能
|
2023-08-09 14:16:27 +08:00 |
|
Fang
|
92a147c14c
|
装备礼包弹出fix
|
2023-08-09 10:57:58 +08:00 |
|
xiekaidong
|
c7c6d5829c
|
bug修复
|
2023-08-09 10:26:20 +08:00 |
|
xiekaidong
|
1eb1295c1c
|
金猪
|
2023-08-09 10:21:13 +08:00 |
|
Fang
|
a81f9de468
|
装备副本扫荡触发礼包未立即弹出fix
|
2023-08-09 10:19:42 +08:00 |
|
Fang
|
c6de387e85
|
材料本扫荡后次数刷新不及时fix
|
2023-08-09 09:52:28 +08:00 |
|
xiekaidong
|
a33851f519
|
bug修复
|
2023-08-08 18:10:25 +08:00 |
|
xiekaidong
|
189d421c2b
|
反伤bug修复
|
2023-08-08 17:49:03 +08:00 |
|
xiekaidong
|
c950bc52be
|
排序
|
2023-08-08 16:55:43 +08:00 |
|
xiekaidong
|
ccb0f42081
|
新buff和新机制
|
2023-08-08 16:38:54 +08:00 |
|
xiekaidong
|
8f07e19054
|
新机制
|
2023-08-08 16:37:57 +08:00 |
|
xiekaidong
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
8ae11ac948
|
新机制
|
2023-08-08 15:58:17 +08:00 |
|
xiekaidong
|
97cddfa125
|
复活buff
|
2023-08-08 15:27:21 +08:00 |
|
xiekaidong
|
d5e8786233
|
更新配置
|
2023-08-08 11:44:16 +08:00 |
|
xiekaidong
|
a6b05117b7
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/userdata/dungeon/dungeon_armor_entity.lua
|
2023-08-08 11:41:34 +08:00 |
|
xiekaidong
|
ad56074c71
|
新增上报
|
2023-08-07 18:15:19 +08:00 |
|
xiekaidong
|
38cd167a9b
|
显示调整
|
2023-08-07 17:21:45 +08:00 |
|
xiekaidong
|
f0ec99f24a
|
字段修改
|
2023-08-07 15:50:46 +08:00 |
|
xiekaidong
|
7aa2b95686
|
宝箱日志上报
|
2023-08-07 15:33:06 +08:00 |
|
xiekaidong
|
8b2d0c6046
|
完善一下结算
|
2023-08-07 11:45:16 +08:00 |
|
xiekaidong
|
f74226c056
|
增加上报属性
|
2023-08-07 10:35:11 +08:00 |
|
xiekaidong
|
792a5a1672
|
优化显示
|
2023-08-07 09:37:00 +08:00 |
|