2969 Commits

Author SHA1 Message Date
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
Fang
0a5e37baa3 优化夏日活动请求 2023-08-17 14:06:58 +08:00
chenxi
e4446afdec fix bug 2023-08-17 10:04:44 +08:00
xiekaidong
81f6b85711 界面 2023-08-16 18:08:49 +08:00
xiekaidong
60a2c2ee3a 战令一键领取 2023-08-16 17:36:18 +08:00
xiekaidong
b2e11a015e 升版本号 v.1.2.1_android v.1.3.1_ios 2023-08-16 15:23:38 +08:00
Fang
a6cda907f0 头像、头像框道具解锁优化 2023-08-16 11:52:53 +08:00
xiekaidong
3bcb923eda 层级调整 2023-08-16 11:28:22 +08:00
zhangpengfei
30564f7a52 角色修改 2023-08-16 11:09:44 +08:00
xiekaidong
a192c8660a 更新配置 2023-08-16 11:05:41 +08:00
xiekaidong
6170cf21e1 Merge branch 'dev_20230815' v.1.2.0_android v.1.3.0_ios 2023-08-15 21:47:36 +08:00
chenxi
c97d9104b4 白名单 2023-08-15 21:47:12 +08:00
xiekaidong
09e5656e83 修改版本号 2023-08-15 21:45:49 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
xiekaidong
6a1403596e Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-15 21:41:08 +08:00