Fang
|
30e6f98fff
|
界面优化
|
2023-09-18 16:37:42 +08:00 |
|
xiekaidong
|
6ed811ca75
|
Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919
|
2023-09-18 16:03:38 +08:00 |
|
xiekaidong
|
26cbfc51eb
|
优化
|
2023-09-18 16:03:35 +08:00 |
|
Fang
|
129528ee50
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:55:17 +08:00 |
|
xiekaidong
|
a69389e473
|
更新图集，编译lua
|
2023-09-18 14:53:52 +08:00 |
|
xiekaidong
|
45174e1f9f
|
Merge branch 'master' into dev_20230919
|
2023-09-18 14:50:51 +08:00 |
|
xiekaidong
|
4badcc0064
|
循环活动的一些处理
|
2023-09-18 14:43:04 +08:00 |
|
xiekaidong
|
b9dcd70ffe
|
bug修复
|
2023-09-18 12:00:29 +08:00 |
|
xiekaidong
|
1979075235
|
优化显示
|
2023-09-18 11:21:25 +08:00 |
|
xiekaidong
|
c4af5f7e5e
|
显示优化
|
2023-09-18 10:52:26 +08:00 |
|
xiekaidong
|
4778ebc5a3
|
bug修复
|
2023-09-18 10:36:23 +08:00 |
|
xiekaidong
|
b60db0e3ef
|
结算界面的表现
|
2023-09-16 20:07:15 +08:00 |
|
xiekaidong
|
68575924be
|
选择界面表现
|
2023-09-16 19:39:43 +08:00 |
|
xiekaidong
|
d2d1dd612e
|
升级表现
|
2023-09-16 19:17:47 +08:00 |
|
xiekaidong
|
2038237e6c
|
界面优化
|
2023-09-16 18:45:50 +08:00 |
|
xiekaidong
|
2dbe46c258
|
第一版梦魇酒馆，差表现
|
2023-09-16 18:08:18 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
xiekaidong
|
8173e46209
|
界面
|
2023-09-16 17:52:18 +08:00 |
|
Fang
|
b36fde93c3
|
整理代码
|
2023-09-15 20:53:50 +08:00 |
|
Fang
|
4c27243520
|
请求优化
|
2023-09-15 20:11:50 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
Fang
|
77191e5707
|
竞技场结算时同步当前积分
|
2023-09-15 17:37:56 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
Fang
|
93582b6d39
|
新用户报错fix
|
2023-09-14 12:04:43 +08:00 |
|
Fang
|
a2b2db3485
|
报错及显示fix
|
2023-09-14 11:04:24 +08:00 |
|
Fang
|
de1565f2c8
|
属性fix
|
2023-09-13 18:23:57 +08:00 |
|
Fang
|
ae7e52d6ea
|
属性加成修改
|
2023-09-13 17:58:57 +08:00 |
|
xiekaidong
|
1e30641b76
|
限时pvp数据层
|
2023-09-13 17:01:17 +08:00 |
|
xiekaidong
|
9ae91b8668
|
bug修复
|
2023-09-13 16:27:23 +08:00 |
|
xiekaidong
|
c365bc65f2
|
兼容处理
|
2023-09-13 15:53:02 +08:00 |
|
Fang
|
3f17beb2f2
|
淬炼锁定提示
|
2023-09-13 15:44:54 +08:00 |
|
xiekaidong
|
9b86946d2c
|
bug修复
|
2023-09-13 15:34:17 +08:00 |
|
Fang
|
b74a41ed00
|
bug_fix
|
2023-09-13 15:31:13 +08:00 |
|
xiekaidong
|
ed65ae452b
|
一些优化和审核模式处理
|
2023-09-13 14:55:52 +08:00 |
|
Fang
|
2d1349eae0
|
自动铸造开启等级
|
2023-09-13 10:37:44 +08:00 |
|
Fang
|
35d78447a8
|
bug fix
|
2023-09-12 18:43:13 +08:00 |
|
Fang
|
6f010c00b4
|
容错
|
2023-09-12 17:59:10 +08:00 |
|
Fang
|
5c490ce2b6
|
显示fix
|
2023-09-12 16:03:22 +08:00 |
|
Fang
|
1f93123171
|
显示fix
|
2023-09-12 15:27:27 +08:00 |
|
Fang
|
1a4b4e9764
|
容错处理
|
2023-09-12 15:02:58 +08:00 |
|
陈希
|
0abdb166d2
|
Merge branch 'fang/runes' into 'dev_20230919'
符文功能
See merge request b6-client/b6-lua!15
|
2023-09-12 06:50:28 +00:00 |
|
xiekaidong
|
577d7392e2
|
Merge branch 'master' into dev_20230919
|
2023-09-12 14:42:04 +08:00 |
|
xiekaidong
|
1ef1f34c7a
|
战斗优化调整
|
2023-09-12 12:23:07 +08:00 |
|
Fang
|
a92ceb5650
|
添加容错
|
2023-09-12 11:24:42 +08:00 |
|
xiekaidong
|
e151b5329e
|
优化
|
2023-09-12 10:49:44 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
xiekaidong
|
94d59731c8
|
Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/const.lua
# lua/app/config/localization/localization_global_const.lua
# lua/app/config/monster_dungeon_rune.lua
# lua/app/config/skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/proto/proto_msg_type.lua
|
2023-09-12 10:07:33 +08:00 |
|
xiekaidong
|
10253fbafb
|
符文副本
|
2023-09-11 20:01:55 +08:00 |
|
xiekaidong
|
b3af360cd3
|
buff修改
|
2023-09-11 10:49:18 +08:00 |
|
xiekaidong
|
a817d25305
|
符文副本
|
2023-09-08 18:53:46 +08:00 |
|