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 |
|
xiekaidong
|
969e7ec6e2
|
资源检查
|
2023-08-15 21:41:05 +08:00 |
|
chenxi
|
f845d5c1fd
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-15 21:40:45 +08:00 |
|
chenxi
|
abf3d6f3aa
|
修改韩语版的logo
|
2023-08-15 21:40:36 +08:00 |
|
xiekaidong
|
b8f7a7a783
|
更新配置
|
2023-08-15 21:39:40 +08:00 |
|
Fang
|
f1d34124b7
|
审核处理
|
2023-08-15 21:25:23 +08:00 |
|
|
|
2ee3df25e9
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-15 21:15:40 +08:00 |
|
|
|
feb63e9933
|
11111
|
2023-08-15 21:15:31 +08:00 |
|
Fang
|
16d8c0e858
|
夏日活动上报修改
|
2023-08-15 20:40:46 +08:00 |
|
Fang
|
1e7440d170
|
夏日活动上报
|
2023-08-15 20:32:37 +08:00 |
|
|
|
16143ea795
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-15 20:31:01 +08:00 |
|
|
|
bb7ceff1e9
|
11
|
2023-08-15 20:30:52 +08:00 |
|
xiekaidong
|
3f7d7dfb21
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-15 20:30:37 +08:00 |
|
xiekaidong
|
a645eb5c63
|
层级调整
|
2023-08-15 20:30:21 +08:00 |
|
|
|
fac1160a61
|
11111
|
2023-08-15 20:30:08 +08:00 |
|
xiekaidong
|
6434cc2f8b
|
资源检查
|
2023-08-15 20:26:29 +08:00 |
|
xiekaidong
|
3527846c69
|
资源检查
|
2023-08-15 19:51:06 +08:00 |
|
xiekaidong
|
c597e71285
|
优化
|
2023-08-15 19:41:11 +08:00 |
|
