xiekaidong
|
d43dd92f9e
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/ui/hero/armor_info_comp.lua.bytes
# Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
# Assets/lua/app/userdata/player/player_data.lua.bytes
# Assets/lua/app/userdata/shop/shop_data.lua.bytes
|
2023-08-08 11:42:31 +08:00 |
|
xiekaidong
|
654a94eab9
|
编译lua
|
2023-08-07 15:33:52 +08:00 |
|
xiekaidong
|
f52b02b929
|
优化显示
|
2023-08-07 09:37:13 +08:00 |
|
Fang
|
8e8320a307
|
礼包界面展示冲突处理
|
2023-08-04 16:00:17 +08:00 |
|
Fang
|
e79f3ea767
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:22 +08:00 |
|
xiekaidong
|
3b182e56c5
|
英雄竞技场段位解锁
|
2023-08-03 18:08:02 +08:00 |
|
xiekaidong
|
80bb50137a
|
bug修复
|
2023-08-03 16:53:57 +08:00 |
|
xiekaidong
|
cd5f588a66
|
统一接口，金币不足提示弹窗询问
|
2023-08-03 14:54:55 +08:00 |
|
xiekaidong
|
8be0258270
|
日志上报
|
2023-08-03 14:20:41 +08:00 |
|
xiekaidong
|
8de4c3340b
|
武器副本增加体力消耗
|
2023-08-03 11:08:40 +08:00 |
|
xiekaidong
|
d24f52825e
|
Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-unity into dev_20230809
|
2023-08-03 10:24:48 +08:00 |
|
xiekaidong
|
d312e42fac
|
优化局内技能显示
|
2023-08-03 10:24:45 +08:00 |
|
Fang
|
6fabe5b071
|
资源副本扫荡不关闭关卡界面
|
2023-08-03 10:09:36 +08:00 |
|
xiekaidong
|
93bd2796b6
|
战斗血条优化
|
2023-08-02 20:34:37 +08:00 |
|
xiekaidong
|
7b8177d69e
|
优化显示
|
2023-08-02 18:56:50 +08:00 |
|
xiekaidong
|
32e93ec980
|
木棍边缘障碍物
|
2023-08-02 18:10:43 +08:00 |
|
xiekaidong
|
999d62cdbd
|
bug修复
|
2023-08-01 18:21:00 +08:00 |
|
Fang
|
694f7eb10b
|
增加优惠入口红点逻辑
|
2023-08-01 18:20:08 +08:00 |
|
xiekaidong
|
31a57fddc6
|
技能机制优化
|
2023-08-01 17:39:15 +08:00 |
|
Fang
|
4749c1a7e4
|
道具获取的头像品质颜色错误fix、防具升级刷新不及时fix
|
2023-08-01 17:16:18 +08:00 |
|
Fang
|
fcba09b85b
|
装备副本材料获取界面排序
|
2023-08-01 16:44:29 +08:00 |
|
Fang
|
257a21b81b
|
防具升级刷新不及时fix
|
2023-08-01 14:46:13 +08:00 |
|
Fang
|
6f13ff7f87
|
添加音效
|
2023-08-01 11:11:29 +08:00 |
|
Fang
|
644e83d710
|
道具获取的头像品质颜色错误fix
|
2023-08-01 10:28:55 +08:00 |
|
xiekaidong
|
dfb2714266
|
更新配置
|
2023-07-31 16:28:15 +08:00 |
|
xiekaidong
|
5e81a3a03c
|
Merge branch 'master' into dev_20230809
# Conflicts:
# Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
# Assets/lua/app/userdata/hero/hero_entity.lua.bytes
|
2023-07-31 16:23:57 +08:00 |
|
Fang
|
23c7b3ed55
|
超框
|
2023-07-31 10:06:51 +08:00 |
|
Fang
|
7e2113df1c
|
支线基金奖励领取按钮文案修改
|
2023-07-31 09:57:34 +08:00 |
|
xiekaidong
|
9a3549ad43
|
引导修改
|
2023-07-28 18:40:31 +08:00 |
|
Fang
|
a8b82718d0
|
1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名
|
2023-07-28 18:05:35 +08:00 |
|
Fang
|
446b417948
|
英雄未解锁时显示初始数值
|
2023-07-28 15:35:54 +08:00 |
|
Fang
|
be4846e7b9
|
抽卡界面不展示装备升级红点
|
2023-07-28 12:05:53 +08:00 |
|
Fang
|
74dec91e6d
|
技能tips
|
2023-07-28 11:46:58 +08:00 |
|
xiekaidong
|
fb4140d219
|
增加容错
|
2023-07-28 10:49:49 +08:00 |
|
Fang
|
f004f4ca4a
|
英雄收集文案fix、武器升级动效显示fix
|
2023-07-28 09:51:02 +08:00 |
|
Fang
|
75e63b9685
|
红点修改
|
2023-07-27 12:03:11 +08:00 |
|
Fang
|
2f1aa1145e
|
英雄图鉴红点fix
|
2023-07-27 10:33:31 +08:00 |
|
xiekaidong
|
34a4fd6725
|
显示优化
|
2023-07-27 09:51:23 +08:00 |
|
Fang
|
9bc06371fb
|
编译
|
2023-07-26 18:23:37 +08:00 |
|
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 |
|
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
|
654c34d0b6
|
动效、fix
|
2023-07-25 22:35:04 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +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 |
|
Fang
|
298a77cb44
|
显示修复、导入特效文件
|
2023-07-25 21:02:08 +08:00 |
|