puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,177 Commits 6 Branches 94 Tags
Commit Graph

1096 Commits

Author SHA1 Message Date
Fang
1ccef0858b 红点遮挡处理 2023-08-15 16:17:21 +08:00
Fang
fe726dbebf 显示fix 2023-08-15 15:34:27 +08:00
Fang
8cfd6358d8 bug fix 2023-08-15 15:08:07 +08:00
Fang
2f59d74b96 竞技场皮肤属性完善 2023-08-15 12:20:17 +08:00
Fang
73257960b8 bug fix 2023-08-15 11:30:21 +08:00
Fang
e802a03550 活动等级达到最大报错fix 2023-08-15 10:28:20 +08:00
Fang
39ae534750 皮肤道具点开界面 2023-08-14 19:34:02 +08:00
xiekaidong
4a4b25e11c 竞技场弹出礼包界面 2023-08-14 14:52:38 +08:00
Fang
0eebc9b6cd 英雄生命值显示fix 2023-08-14 11:12:57 +08:00
Fang
a1a13036c9 夏日活动战令购买spine动画调换 2023-08-14 09:58:26 +08:00
Fang
391e171497 资源替换 2023-08-11 17:02:08 +08:00
Fang
fde89edddb 装备副本界面添加礼包入口 2023-08-11 16:34:50 +08:00
Fang
eb566b7782 fix 2023-08-11 16:03:00 +08:00
Fang
03ed69d44a 竞技场宝箱tips 2023-08-11 15:49:06 +08:00
Fang
34282dc81b 竞技场宝箱弹出规则优化、bugfix 2023-08-11 15:37:26 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
Fang
ba449382a9 细节完善 2023-08-11 14:26:52 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
9c8b20f1fb bug修复 2023-08-10 19:27:48 +08:00
Fang
8c88139a09 皮肤属性增加生命加成显示 2023-08-10 16:31:25 +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
d4aaf40b55 皮肤收集不需要帮助按钮 2023-08-09 16:47:03 +08:00
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +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
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
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
38cd167a9b 显示调整 2023-08-07 17:21:45 +08:00
xiekaidong
7aa2b95686 宝箱日志上报 2023-08-07 15:33:06 +08:00
xiekaidong
792a5a1672 优化显示 2023-08-07 09:37:00 +08:00
Fang
e79f7bcfa0 礼包界面展示冲突处理 2023-08-04 15:56:54 +08:00
Fang
84e1e14d79 装备材料副本扫荡排序修改 2023-08-04 10:53:00 +08:00
xiekaidong
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +08:00
xiekaidong
fdfeae8819 bug修复 2023-08-03 16:53:47 +08:00
xiekaidong
e05f02088c 统一接口，金币不足提示弹窗询问 2023-08-03 14:53:51 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
xiekaidong
66838d4dad 增加上报 2023-08-03 11:30:10 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
0f5ec9aa5d Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-lua into dev_20230809 2023-08-03 10:24:04 +08:00
xiekaidong
619bfad50a 优化局内技能显示 2023-08-03 10:24:00 +08:00
Fang
35f9f629d3 资源副本扫荡不关闭关卡界面 2023-08-03 10:09:10 +08:00
xiekaidong
24d90bfd1c 战斗血条优化 2023-08-02 20:34:25 +08:00
xiekaidong
2018d556bb 优化显示 2023-08-02 18:56:28 +08:00
xiekaidong
62ee8bab01 木棍边缘障碍物 2023-08-02 18:07:44 +08:00
xiekaidong
a90f0f4583 bug修复 2023-08-01 18:20:35 +08:00