xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
74681e64c7
|
sdk升级
|
2023-09-18 11:26:51 +08:00 |
|
xiekaidong
|
178c761583
|
提升版本号
|
2023-09-13 14:59:27 +08:00 |
|
xiekaidong
|
06f81a091a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.bytes
|
2023-09-12 14:41:48 +08:00 |
|
xiekaidong
|
8638d3f2e2
|
提升版本号
|
2023-09-12 11:59:13 +08:00 |
|
xiekaidong
|
d19f63d08a
|
提升版本号
|
2023-09-06 16:59:26 +08:00 |
|
chenxi
|
67dfdf94c6
|
打包工具完善
|
2023-09-06 15:28:10 +08:00 |
|
xiekaidong
|
d3b124c536
|
Merge branch 'master' into dev_20230919
|
2023-09-06 10:20:38 +08:00 |
|
chenxi
|
7089eb2821
|
提升版本号
|
2023-09-05 22:27:59 +08:00 |
|
xiekaidong
|
45ab702c1c
|
maxSDK升级
|
2023-09-04 21:00:23 +08:00 |
|
xiekaidong
|
d6046b2e7d
|
Merge branch 'master' into dev_20230919
|
2023-08-30 09:19:48 +08:00 |
|
xiekaidong
|
b188be5dd4
|
提升版本号
|
2023-08-29 21:42:21 +08:00 |
|
xiekaidong
|
27d17254a7
|
Merge branch 'master' into dev_20230919
|
2023-08-29 19:41:13 +08:00 |
|
xiekaidong
|
1dbe2391dc
|
提升版本号
|
2023-08-29 17:17:25 +08:00 |
|
xiekaidong
|
8cef52f549
|
Merge branch 'dev_20230919' into sdk_2
|
2023-08-24 15:48:02 +08:00 |
|
xiekaidong
|
e4df3deb60
|
提升版本号
|
2023-08-21 16:02:56 +08:00 |
|
xiekaidong
|
17798bf02e
|
提升版本号
|
2023-08-18 15:16:49 +08:00 |
|
chenxi
|
01427a9f4c
|
打包脚本
|
2023-08-17 16:53:55 +08:00 |
|
chenxi
|
4316bca531
|
自动设置版本号
|
2023-08-17 14:15:07 +08:00 |
|
xiekaidong
|
b2e11a015e
|
升版本号
|
2023-08-16 15:23:38 +08:00 |
|
xiekaidong
|
09e5656e83
|
修改版本号
|
2023-08-15 21:45:49 +08:00 |
|
xiekaidong
|
e51d67d317
|
ios本地化
|
2023-08-15 16:29:53 +08:00 |
|
xiekaidong
|
b71d37f58b
|
打包
|
2023-08-15 11:44:15 +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
|
1290a24e06
|
复制文件目录
|
2023-08-15 09:17:57 +08:00 |
|
xiekaidong
|
f8ad085f8b
|
代码调整
|
2023-08-14 22:13:46 +08:00 |
|
xiekaidong
|
b1ecbc74fa
|
多语言
|
2023-08-14 21:58:25 +08:00 |
|
chenxi
|
5ab8615d87
|
先去掉Moloco
|
2023-08-14 19:58:35 +08:00 |
|
chenxi
|
3a853e7771
|
xlua
|
2023-08-14 16:14:25 +08:00 |
|
xiekaidong
|
695a02a56d
|
修改版本号
|
2023-08-10 17:44:45 +08:00 |
|
xiekaidong
|
977b3c8c91
|
Merge branch 'master' into dev_20230815
# Conflicts:
# Assets/lua/app/config/arena_bounty_level.lua.bytes
# Assets/lua/app/config/arena_rank.lua.bytes
# Assets/lua/app/config/avatar_frame.lua.bytes
# Assets/lua/app/config/chapter.lua.bytes
# Assets/lua/app/config/chapter_board.lua.bytes
# Assets/lua/app/config/grid_type.lua.bytes
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/monster_chapter.lua.bytes
# Assets/lua/app/config/monster_daily_challenge.lua.bytes
# Assets/lua/app/config/monster_dungeon_armor.lua.bytes
# Assets/lua/app/config/strings/cn/avatar.lua.bytes
# Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/en/avatar.lua.bytes
# Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/es/avatar.lua.bytes
# Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/es/item.lua.bytes
# Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/id/avatar.lua.bytes
# Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ja/avatar.lua.bytes
# Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/ko/avatar.lua.bytes
# Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/pt/avatar.lua.bytes
# Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/th/avatar.lua.bytes
# Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/vi/avatar.lua.bytes
# Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
# Assets/lua/app/config/strings/zh/avatar.lua.bytes
# Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
# Assets/lua/app/config/summon.lua.bytes
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
# Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
# Assets/lua/app/module/battle/team/battle_team.lua.bytes
# Assets/lua/app/module/shop/shop_manager.lua.bytes
|
2023-08-10 09:38:07 +08:00 |
|
chenxi
|
e38ce4e68e
|
接入Moloco广告适配器
|
2023-08-09 22:10:47 +08:00 |
|
xiekaidong
|
bc6510f5a9
|
提升版本号
|
2023-08-09 17:36:09 +08:00 |
|
xiekaidong
|
499b1726e6
|
修改版本号
|
2023-08-04 16:24:10 +08:00 |
|
xiekaidong
|
9837b2e0b4
|
升版本号
|
2023-08-02 19:57:37 +08:00 |
|
xiekaidong
|
b8d46cbb32
|
提升版本号
|
2023-07-31 12:19:31 +08:00 |
|
xiekaidong
|
8f98a75a89
|
修改版本号
|
2023-07-28 19:02:46 +08:00 |
|
xiekaidong
|
2035826fce
|
提升版本号
|
2023-07-28 11:28:03 +08:00 |
|
xiekaidong
|
1b0abc14c4
|
版本号还原一下，不用升版本
|
2023-07-27 17:07:07 +08:00 |
|
xiekaidong
|
a4594e1374
|
增加版本号
|
2023-07-27 16:13:55 +08:00 |
|
xiekaidong
|
5bed0fb78c
|
增加版本号
|
2023-07-27 12:34:48 +08:00 |
|
xiekaidong
|
3bea93894e
|
增加版本号
|
2023-07-25 22:11:18 +08:00 |
|
chenxi
|
b151021d36
|
升级版本号
|
2023-07-20 15:27:44 +08:00 |
|
chenxi
|
2f604c9a86
|
热更版本
|
2023-07-18 15:10:24 +08:00 |
|
chenxi
|
133f12e806
|
提升版本号
|
2023-07-17 18:45:44 +08:00 |
|
chenxi
|
2d3a8b9085
|
提升版本号
|
2023-07-17 17:53:42 +08:00 |
|
chenxi
|
52b5c3a267
|
版本号哦
|
2023-07-14 16:29:01 +08:00 |
|
chenxi
|
6973d8d6e5
|
提升版本
|
2023-07-12 17:02:58 +08:00 |
|
chenxi
|
054d28b725
|
热更
|
2023-07-11 14:54:47 +08:00 |
|
chenxi
|
b113e1b4d5
|
FB参数
|
2023-07-10 17:12:42 +08:00 |
|