Fang
|
a43ea6c7d7
|
编译
|
2023-07-26 16:15:13 +08:00 |
|
Fang
|
e31bf25fa3
|
装备红点、文案
|
2023-07-26 15:16:01 +08:00 |
|
xiekaidong
|
57867145a4
|
显示优化
|
2023-07-26 11:48:07 +08:00 |
|
xiekaidong
|
1c967bd864
|
刷新界面
|
2023-07-25 23:41:42 +08:00 |
|
Fang
|
5431c724af
|
fix
|
2023-07-25 23:33:30 +08:00 |
|
xiekaidong
|
9f25ac377e
|
bug修复
|
2023-07-25 23:14:31 +08:00 |
|
Fang
|
5abcbc47e7
|
支线基金跨阶段fix
|
2023-07-25 23:11:00 +08:00 |
|
Fang
|
2651eafff4
|
装备礼包重登不弹窗
|
2023-07-25 22:49:12 +08:00 |
|
Fang
|
654c34d0b6
|
动效、fix
|
2023-07-25 22:35:04 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
2af5fb2301
|
资源检查，更新配置，编译lua，更新pb
|
2023-07-25 22:09:41 +08:00 |
|
xiekaidong
|
6586382722
|
Merge branch 'master' into dev_20230725
# Conflicts:
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/common/data_manager.lua.bytes
# Assets/lua/app/common/pay_manager.lua.bytes
# Assets/lua/app/common/sdk_manager.lua.bytes
# Assets/lua/app/module/chapter/chapter_manager.lua.bytes
# Assets/lua/app/userdata/hero/hero_data.lua.bytes
# Assets/proto/protocol.bytes
|
2023-07-25 22:07:22 +08:00 |
|
xiekaidong
|
8a1e124054
|
优化显示
|
2023-07-25 21:52:41 +08:00 |
|
xiekaidong
|
8f360a86c7
|
bug修复
|
2023-07-25 21:19:01 +08:00 |
|
Fang
|
298a77cb44
|
显示修复、导入特效文件
|
2023-07-25 21:02:08 +08:00 |
|
Fang
|
8506550027
|
拼写错误fix
|
2023-07-25 20:28:49 +08:00 |
|
Fang
|
aa45c8bbf2
|
编译
|
2023-07-25 20:18:47 +08:00 |
|
xiekaidong
|
5e6093378c
|
更新配置
|
2023-07-25 19:29:18 +08:00 |
|
Fang
|
698bf8e05c
|
编译
|
2023-07-25 18:12:06 +08:00 |
|
xiekaidong
|
c9ffa43d94
|
bug修复
|
2023-07-25 17:17:05 +08:00 |
|
xiekaidong
|
687f373a2e
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-25 16:51:01 +08:00 |
|
xiekaidong
|
97708c861a
|
更新配置
|
2023-07-25 16:50:58 +08:00 |
|
Fang
|
ab3b086d91
|
修复英雄首次升级装备报错
|
2023-07-25 16:48:49 +08:00 |
|
xiekaidong
|
282476fbd7
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-25 16:37:02 +08:00 |
|
xiekaidong
|
8cdcbd5c1f
|
多语言
|
2023-07-25 16:36:56 +08:00 |
|
Fang
|
5cff8c0e57
|
超框、修复报错
|
2023-07-25 16:33:15 +08:00 |
|
Fang
|
d829c85777
|
编译
|
2023-07-25 16:13:33 +08:00 |
|
xiekaidong
|
23ea46e1e2
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/config/strings/cn/global.lua.bytes
|
2023-07-25 16:06:27 +08:00 |
|
xiekaidong
|
4cc90051a4
|
韩国社区跳转处理
|
2023-07-25 16:06:17 +08:00 |
|
Fang
|
e7927efe57
|
编译
|
2023-07-25 15:45:24 +08:00 |
|
xiekaidong
|
7752930572
|
bug修复
|
2023-07-25 15:36:24 +08:00 |
|
xiekaidong
|
e0e6ebfd4b
|
显示调整
|
2023-07-24 22:01:10 +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
|
ae520c3757
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 21:20:27 +08:00 |
|
xiekaidong
|
863446d377
|
bug修复
|
2023-07-24 21:20:23 +08:00 |
|
Fang
|
60652a2829
|
防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画
|
2023-07-24 21:07:54 +08:00 |
|
xiekaidong
|
8b4a69cb90
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 20:55:07 +08:00 |
|
xiekaidong
|
0a7c4c5170
|
bug修复
|
2023-07-24 20:55:03 +08:00 |
|
xiekaidong
|
8c3abfac91
|
bug修复
|
2023-07-26 00:18:57 +08:00 |
|
Fang
|
4b93fa1335
|
修复装备升级后，总属性显示错误
|
2023-07-24 20:33:56 +08:00 |
|
xiekaidong
|
53af8c65af
|
调整一下逻辑
|
2023-07-24 18:48:32 +08:00 |
|
xiekaidong
|
aaf9e7520c
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
# Conflicts:
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
|
2023-07-24 18:48:16 +08:00 |
|
xiekaidong
|
3cfb991ee9
|
调整一下逻辑
|
2023-07-24 18:48:04 +08:00 |
|
Fang
|
04730d1ad9
|
装备属性加成计算fix
|
2023-07-24 18:38:23 +08:00 |
|
xiekaidong
|
b4ddfb7945
|
一些报错修复
|
2023-07-24 18:32:51 +08:00 |
|
xiekaidong
|
f760328136
|
修复一下报错问题
|
2023-07-24 18:02:04 +08:00 |
|
xiekaidong
|
894c979aa9
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725
|
2023-07-24 17:11:03 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|