chenxi
|
0912071578
|
安卓依赖
|
2023-08-15 09:41:11 +08:00 |
|
xiekaidong
|
9cdeac081d
|
编译lua
|
2023-08-15 09:38:22 +08:00 |
|
xiekaidong
|
1729539f40
|
Merge branch 'master' into dev_20230815
# Conflicts:
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
|
2023-08-15 09:35:50 +08:00 |
|
xiekaidong
|
200ebe808b
|
技能位置
|
2023-08-15 09:22:18 +08:00 |
|
xiekaidong
|
3254fd04d6
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-15 09:18:00 +08:00 |
|
xiekaidong
|
1290a24e06
|
复制文件目录
|
2023-08-15 09:17:57 +08:00 |
|
|
|
3af536d18d
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 22:21:20 +08:00 |
|
|
|
40bb269cd4
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 22:21:01 +08:00 |
|
chenxi
|
e7a1fd2b0c
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-14 22:21:00 +08:00 |
|
chenxi
|
8ddf543092
|
资源
|
2023-08-14 22:20:51 +08:00 |
|
|
|
e70c150a77
|
11111
|
2023-08-14 22:20:46 +08:00 |
|
xiekaidong
|
e98a5855f2
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 22:13:50 +08:00 |
|
xiekaidong
|
f8ad085f8b
|
代码调整
|
2023-08-14 22:13:46 +08:00 |
|
|
|
c49c53bd29
|
11111
|
2023-08-14 22:08:59 +08:00 |
|
|
|
72d11545e3
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 22:05:30 +08:00 |
|
|
|
186684915b
|
11111111
|
2023-08-14 22:05:22 +08:00 |
|
xiekaidong
|
b1ecbc74fa
|
多语言
|
2023-08-14 21:58:25 +08:00 |
|
|
|
961e69e534
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 21:33:27 +08:00 |
|
|
|
3567e19797
|
11111111
|
2023-08-14 21:33:17 +08:00 |
|
chenxi
|
94520452eb
|
sdk设置
|
2023-08-14 21:20:51 +08:00 |
|
chenxi
|
82bfdfc9e5
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
# Conflicts:
# Assets/arts/sounds/sfx/battle/140020151.wav.meta
# Assets/arts/sounds/sfx/battle/14003201.wav.meta
# Assets/arts/sounds/sfx/battle/3400321.wav.meta
|
2023-08-14 21:10:27 +08:00 |
|
xiekaidong
|
72ae396c7c
|
更新资源
|
2023-08-14 21:05:53 +08:00 |
|
chenxi
|
5f9930086e
|
新资源
|
2023-08-14 21:05:37 +08:00 |
|
xiekaidong
|
26bfed993b
|
音效
|
2023-08-14 21:04:17 +08:00 |
|
chenxi
|
349c36021f
|
屏蔽ironsource ios 部分
|
2023-08-14 20:44:28 +08:00 |
|
chenxi
|
b37d58fc29
|
xlua
|
2023-08-14 20:39:48 +08:00 |
|
chenxi
|
957e5ac9ad
|
xlua
|
2023-08-14 20:36:29 +08:00 |
|
chenxi
|
cfac263d3a
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-14 19:59:07 +08:00 |
|
chenxi
|
c78cea4045
|
先去掉Moloco
|
2023-08-14 19:59:01 +08:00 |
|
chenxi
|
5ab8615d87
|
先去掉Moloco
|
2023-08-14 19:58:35 +08:00 |
|
Fang
|
f788462596
|
皮肤道具点开界面
|
2023-08-14 19:35:04 +08:00 |
|
chenxi
|
7347201f23
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-14 19:12:34 +08:00 |
|
chenxi
|
3feebb0d9d
|
xlua
|
2023-08-14 19:12:19 +08:00 |
|
Fang
|
662fd60a54
|
报错fix
|
2023-08-14 18:40:53 +08:00 |
|
Fang
|
566ac2d369
|
容错、导表
|
2023-08-14 18:33:10 +08:00 |
|
zhangpengfei
|
835e3a16bd
|
角色修改
|
2023-08-14 17:52:24 +08:00 |
|
Fang
|
ac48fb604e
|
编译
|
2023-08-14 17:49:40 +08:00 |
|
xiekaidong
|
67ce4b8a54
|
资源
|
2023-08-14 17:11:32 +08:00 |
|
xiekaidong
|
6613968878
|
还原刘海屏
|
2023-08-14 17:08:25 +08:00 |
|
xiekaidong
|
9641889e5d
|
重生处理
|
2023-08-14 16:29:01 +08:00 |
|
chenxi
|
f8677b9da5
|
Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815
|
2023-08-14 16:14:34 +08:00 |
|
chenxi
|
3a853e7771
|
xlua
|
2023-08-14 16:14:25 +08:00 |
|
Fang
|
6e9b10e7a3
|
容错处理
|
2023-08-14 16:13:42 +08:00 |
|
|
|
0a26dee331
|
p0023
|
2023-08-14 15:07:14 +08:00 |
|
|
|
5427520356
|
p0023,29
|
2023-08-14 15:03:03 +08:00 |
|
xiekaidong
|
3f24e53428
|
皮肤音效
|
2023-08-14 14:56:56 +08:00 |
|
xiekaidong
|
cc6508dc20
|
金猪界面
|
2023-08-14 14:54:21 +08:00 |
|
xiekaidong
|
cbce761a98
|
竞技场弹出礼包界面
|
2023-08-14 14:52:58 +08:00 |
|
xiekaidong
|
93787e2194
|
初始化刘海屏
|
2023-08-14 14:46:02 +08:00 |
|
xiekaidong
|
e8186b9d29
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815
|
2023-08-14 14:45:13 +08:00 |
|
