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
|
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
|
f74226c056
|
增加上报属性
|
2023-08-07 10:35:11 +08:00 |
|
xiekaidong
|
82823526d9
|
自愈、海洋护盾buff
|
2023-08-04 16:19:59 +08:00 |
|
xiekaidong
|
2015b03a74
|
显示修复
|
2023-08-04 15:17:28 +08:00 |
|
xiekaidong
|
8266b13b9a
|
棋盘机制调整
|
2023-08-04 14:24:01 +08:00 |
|
xiekaidong
|
3753255d93
|
显示bug修复
|
2023-08-04 11:33:43 +08:00 |
|
xiekaidong
|
5f2269f687
|
付费项上报异常问题修复
|
2023-08-03 18:10:35 +08:00 |
|
xiekaidong
|
1620d69548
|
英雄竞技场段位解锁
|
2023-08-03 18:07:24 +08:00 |
|
xiekaidong
|
fdfeae8819
|
bug修复
|
2023-08-03 16:53:47 +08:00 |
|
xiekaidong
|
a47f18db07
|
日志上报
|
2023-08-03 14:20:16 +08:00 |
|
xiekaidong
|
e0c2821f76
|
武器副本增加体力消耗
|
2023-08-03 11:08:04 +08:00 |
|
xiekaidong
|
4c8eff015e
|
显示bug修复
|
2023-08-03 09:47:21 +08:00 |
|
xiekaidong
|
c6127ec0ae
|
优化显示逻辑
|
2023-08-02 18:47:25 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
Fang
|
591aee945b
|
增加优惠入口红点逻辑
|
2023-08-01 18:19:29 +08:00 |
|
Fang
|
536cc1dfc3
|
道具获取的头像品质颜色错误fix
|
2023-08-01 17:12:39 +08:00 |
|
Fang
|
d30f382d40
|
道具获取的头像品质颜色错误fix
|
2023-08-01 10:28:22 +08:00 |
|
xiekaidong
|
0c840c0cc8
|
Merge branch 'battle' into dev_20230809
|
2023-07-31 16:25:48 +08:00 |
|
xiekaidong
|
80be66cc4b
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/userdata/hero/hero_entity.lua
|
2023-07-31 16:25:06 +08:00 |
|
xiekaidong
|
caf1fd0af9
|
战斗续关
|
2023-07-31 16:22:05 +08:00 |
|
Fang
|
d38ed4a99f
|
昵称不缓存多语言文本
|
2023-07-31 11:16:38 +08:00 |
|
Fang
|
23d9fec3ac
|
基金购买状态fix
|
2023-07-31 09:45:28 +08:00 |
|
xiekaidong
|
96c9cf8c18
|
bug修复
|
2023-07-28 18:51:03 +08:00 |
|
xiekaidong
|
ef6969c4d9
|
引导修改
|
2023-07-28 18:40:11 +08:00 |
|
Fang
|
228bf96ecf
|
容错
|
2023-07-28 16:10:57 +08:00 |
|
xiekaidong
|
3e8a90ce04
|
bug修复
|
2023-07-27 10:04:01 +08:00 |
|
Fang
|
e688bfd26d
|
英雄红点fix
|
2023-07-26 18:23:12 +08:00 |
|
xiekaidong
|
260b6f0c95
|
修改
|
2023-07-26 16:25:35 +08:00 |
|
Fang
|
9a3850c145
|
添加英雄升级标签红点，标签红点更新fix
|
2023-07-26 16:14:24 +08:00 |
|
Fang
|
a80e0b5e90
|
装备红点、文案
|
2023-07-26 15:14:44 +08:00 |
|
Fang
|
6d3a0748a1
|
fix
|
2023-07-25 23:32:59 +08:00 |
|
Fang
|
0448dd5fa2
|
支线基金跨阶段fix
|
2023-07-25 23:10:35 +08:00 |
|
Fang
|
5d8cb4bfff
|
装备礼包重登不弹窗
|
2023-07-25 22:48:49 +08:00 |
|
Fang
|
11624308ea
|
动效、fix
|
2023-07-25 22:33:51 +08:00 |
|
Fang
|
3dbb432b51
|
显示fix
|
2023-07-25 21:01:32 +08:00 |
|
Fang
|
1cfc1c5631
|
审核模式侧边栏不显示装备礼包入口
|
2023-07-25 20:16:49 +08:00 |
|
Fang
|
1fe31d8035
|
装备礼包每次战斗后重复弹出
|
2023-07-25 20:14:33 +08:00 |
|
Fang
|
6f18d573a9
|
防具属性只用计算一次
|
2023-07-25 19:59:31 +08:00 |
|
Fang
|
a5d2749ede
|
支线基金看完广告直接领奖
|
2023-07-25 19:59:31 +08:00 |
|
Fang
|
27affc743b
|
装备数值显示与计算分开处理
|
2023-07-25 17:18:43 +08:00 |
|
Fang
|
8f01d97ea5
|
修复英雄首次升级装备报错
|
2023-07-25 16:48:19 +08:00 |
|
Fang
|
e56378d804
|
修复报错
|
2023-07-25 16:32:37 +08:00 |
|
Fang
|
5fcf27a659
|
基金ad奖励显示fix
|
2023-07-25 15:44:10 +08:00 |
|
Fang
|
6a220afca8
|
属性计算修复
|
2023-07-25 15:44:10 +08:00 |
|
xiekaidong
|
c58bb1b185
|
bug修复
|
2023-07-25 15:35:55 +08:00 |
|
xiekaidong
|
933e402b85
|
bug修复
|
2023-07-24 21:20:06 +08:00 |
|