|
|
7a34de2a39
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
|
2023-08-28 09:42:39 +08:00 |
|
|
|
456deab80a
|
11
|
2023-08-28 09:42:26 +08:00 |
|
Fang
|
b460d9d8c5
|
段位奖励段位图标显示修改
|
2023-08-25 10:36:35 +08:00 |
|
xiekaidong
|
c180b32e81
|
动画
|
2023-08-24 18:29:57 +08:00 |
|
xiekaidong
|
5bffd844c1
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
|
2023-08-24 18:26:12 +08:00 |
|
xiekaidong
|
0ec05b592c
|
更改基金开启时间
|
2023-08-24 18:26:03 +08:00 |
|
陈希
|
ca7f897efe
|
Merge branch 'fang/装备礼包' into 'dev_20230829'
装备升级礼包
See merge request b6-client/b6-unity!15
|
2023-08-24 10:24:23 +00:00 |
|
Fang
|
2b11c3a6b0
|
定时器处理
|
2023-08-24 18:21:22 +08:00 |
|
Fang
|
be98aa91d8
|
段位奖励展示修改、添加收集标签红点
|
2023-08-24 18:09:55 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
7b7ee7aa0c
|
容错
|
2023-08-24 14:30:53 +08:00 |
|
xiekaidong
|
d716440747
|
界面处理
|
2023-08-23 17:46:57 +08:00 |
|
xiekaidong
|
5051d418c8
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
# Conflicts:
# Assets/arts/spines/ui/ui_herofund_banner.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.atlas.txt.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.png.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.skel.bytes.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_atlas.asset
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_atlas.asset.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_material.mat
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_material.mat.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_skeletondata.asset
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_skeletondata.asset.meta
# Assets/arts/spines/ui/ui_main_herofund.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.atlas.txt.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.png.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.skel.bytes
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.skel.bytes.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_atlas.asset
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_atlas.asset.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_material.mat
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_material.mat.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_skeletondata.asset
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_skeletondata.asset.meta
|
2023-08-23 17:37:36 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
Fang
|
ca460b1b01
|
通行证banner资源导入
|
2023-08-23 16:58:52 +08:00 |
|
Fang
|
644a3f5cc3
|
spine资源导入
|
2023-08-23 16:48:33 +08:00 |
|
陈希
|
57234a1738
|
Merge branch 'fang/arena' into 'dev_20230829'
竞技场段位奖励
See merge request b6-client/b6-unity!12
|
2023-08-23 07:55:51 +00:00 |
|
Fang
|
5444cab3db
|
1
|
2023-08-23 15:50:21 +08:00 |
|
Fang
|
7837455596
|
竞技场段位奖励
|
2023-08-23 14:41:56 +08:00 |
|
xiekaidong
|
bd50d89651
|
解锁判定
|
2023-08-22 18:09:31 +08:00 |
|
xiekaidong
|
5d5606c887
|
排序
|
2023-08-22 17:48:18 +08:00 |
|
|
|
524c4367c2
|
p0023受击骷髅
|
2023-08-22 15:52:10 +08:00 |
|
Fang
|
519480c7dd
|
新增皮肤报错fix
|
2023-08-22 11:57:00 +08:00 |
|
|
|
8f2527bb76
|
亚历山大皮肤
|
2023-08-21 21:10:44 +08:00 |
|
xiekaidong
|
e4df3deb60
|
提升版本号
v.1.2.3_android
v.1.3.3_ios
|
2023-08-21 16:02:56 +08:00 |
|
Fang
|
ad82aba16d
|
连续快速扫荡显示fix
|
2023-08-21 14:55:22 +08:00 |
|
Fang
|
20aa364195
|
连续快速扫荡显示fix
|
2023-08-21 14:38:25 +08:00 |
|
xiekaidong
|
9b4ab7f785
|
bug修复
|
2023-08-21 11:24:57 +08:00 |
|
xiekaidong
|
f3b4bbb154
|
更新配置
|
2023-08-21 10:49:03 +08:00 |
|
xiekaidong
|
713c7b8f87
|
bug修复
|
2023-08-21 10:33:37 +08:00 |
|
xiekaidong
|
b36941172c
|
编译lua
|
2023-08-21 09:48:42 +08:00 |
|
xiekaidong
|
7134e96cc8
|
Merge branch 'master' into dev_20230829
# Conflicts:
# Assets/lua/app/common/event_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/proto/protocol.bytes
|
2023-08-21 09:47:38 +08:00 |
|
xiekaidong
|
0f64030d8e
|
报错修复
|
2023-08-21 09:47:13 +08:00 |
|
chenxi
|
72775fbd50
|
上报参数
|
2023-08-18 20:13:47 +08:00 |
|
xiekaidong
|
deae480ef3
|
诅咒回血被腐败影响
|
2023-08-18 18:56:09 +08:00 |
|
xiekaidong
|
6441196517
|
一些描述
|
2023-08-18 18:36:08 +08:00 |
|
xiekaidong
|
033c2e8d63
|
英雄基金
|
2023-08-18 18:10:12 +08:00 |
|
xiekaidong
|
46e7fbc5de
|
Merge branch 'herofund' into dev_20230829
|
2023-08-18 18:09:25 +08:00 |
|
xiekaidong
|
02481f50b4
|
英雄基金
|
2023-08-18 18:08:58 +08:00 |
|
xiekaidong
|
17798bf02e
|
提升版本号
v.1.2.2_android
v.1.3.2_ios
|
2023-08-18 15:16:49 +08:00 |
|
xiekaidong
|
1c829259d9
|
更新多语言
|
2023-08-18 11:54:24 +08:00 |
|
xiekaidong
|
06f20dfc8e
|
更新资源
|
2023-08-18 11:49:01 +08:00 |
|
xiekaidong
|
06797a20de
|
选技能buf修复
|
2023-08-18 11:45:05 +08:00 |
|
xiekaidong
|
cd3a75c78f
|
英雄基金
|
2023-08-18 11:38:26 +08:00 |
|
xiekaidong
|
3ace779c74
|
一些优化和容错
|
2023-08-18 10:56:29 +08:00 |
|
Fang
|
eb6a23021e
|
编译
|
2023-08-17 19:09:41 +08:00 |
|
xiekaidong
|
50a2298e84
|
更新配置
|
2023-08-17 18:59:24 +08:00 |
|
xiekaidong
|
f8c3dc9bb0
|
界面和协议
|
2023-08-17 18:15:39 +08:00 |
|
chenxi
|
01427a9f4c
|
打包脚本
|
2023-08-17 16:53:55 +08:00 |
|
chenxi
|
4316bca531
|
自动设置版本号
|
2023-08-17 14:15:07 +08:00 |
|
