2585 Commits

Author SHA1 Message Date
xiekaidong
e51d67d317 ios本地化 2023-08-15 16:29:53 +08:00
xiekaidong
32a5d23a0c 替换资源 2023-08-15 15:00:48 +08:00
xiekaidong
4d1635dc3b 背景特效 2023-08-15 14:59:48 +08:00
Fang
335ab77238 竞技场皮肤属性完善 2023-08-15 12:20:55 +08:00
xiekaidong
c438b6fbd3 战斗任务统计 2023-08-15 12:15:43 +08:00
xiekaidong
ceb3cbfdbc 音效 2023-08-15 12:03:38 +08:00
xiekaidong
b7caf1dbf8 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-15 11:54:33 +08:00
xiekaidong
35e781df19 替换 2023-08-15 11:54:30 +08:00
xiekaidong
c4d52097e8 bug修复 2023-08-15 11:52:02 +08:00
chenxi
5e22aa1c23 Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815 2023-08-15 11:47:16 +08:00
chenxi
ac475adb24 mipmap 2023-08-15 11:47:09 +08:00
xiekaidong
2194495db0 Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-15 11:44:18 +08:00
xiekaidong
b71d37f58b 打包 2023-08-15 11:44:15 +08:00
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
edad5d3459 1111 2023-08-15 11:33:51 +08:00
7255a8648d 1111111 2023-08-15 11:24:42 +08:00
4fad3e682e Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815 2023-08-15 11:15:38 +08:00
fa3a1aa9f6 11111111 2023-08-15 11:15:28 +08:00
ecefac269c 0033 2023-08-15 11:06:34 +08:00
1973964d4f p0033 2023-08-15 10:55:27 +08:00
Fang
ea746f2851 导入武器图片 2023-08-15 10:41:35 +08:00
Fang
212c93632b 活动等级达到最大报错fix 2023-08-15 10:28:42 +08:00
chenxi
afdf13a0a2 Merge branch 'dev_20230815' of git.juzugame.com:b6-client/b6-unity into dev_20230815 2023-08-15 09:41:20 +08:00
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