puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/module
History
xiekaidong 4e5021741d Merge branch 'dev_20230905' into boss_rush 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
2023-09-01 21:18:54 +08:00
..
account
封号删除账号
2023-08-28 14:12:36 +08:00
activity
Merge branch 'dev_20230905' into boss_rush
2023-09-01 21:18:54 +08:00
arena
竞技场段位奖励
2023-08-23 14:40:52 +08:00
battle
Merge branch 'dev_20230905' into boss_rush
2023-09-01 21:18:54 +08:00
bounty
战令一键领取
2023-08-16 17:35:17 +08:00
chapter
新手14天乐
2023-09-01 15:35:19 +08:00
character_fsm
棋盘
2023-04-06 10:38:04 +08:00
collection
皮肤功能
2023-08-09 14:16:27 +08:00
commerce
添加一些容错
2023-07-24 17:04:40 +08:00
common
bossrush
2023-08-31 20:18:14 +08:00
daily_challenge
新手14天乐
2023-09-01 15:35:19 +08:00
dungeon
战斗任务统计
2023-08-15 12:15:21 +08:00
dungeon_armor
一些优化和容错
2023-08-18 10:55:51 +08:00
dungeon_weapon
一些优化和容错
2023-08-18 10:55:51 +08:00
equip
新手14天乐
2023-09-01 15:35:19 +08:00
formation
添加一些容错
2023-07-24 17:04:40 +08:00
fund
竞技场战令
2023-06-26 11:26:28 +08:00
game_setting
韩国社区跳转处理
2023-07-25 16:06:04 +08:00
gm
战令一键领取
2023-08-16 17:35:17 +08:00
hero
英雄排序方式
2023-08-18 18:46:44 +08:00
idle
体力不足得时候弹出来购买体力界面
2023-05-19 17:08:19 +08:00
item
新手14天乐
2023-09-01 15:35:19 +08:00
loading
整理代码
2023-04-03 10:59:13 +08:00
login
登录状态
2023-08-28 14:19:41 +08:00
mail
延迟提高一点
2023-08-09 17:32:57 +08:00
maincity
Merge branch 'dev_20230905' into boss_rush
2023-09-01 21:18:54 +08:00
player
添加头像、头像框道具解锁逻辑
2023-07-07 11:04:22 +08:00
shop
活动礼包弹出逻辑补充
2023-08-11 15:08:23 +08:00
skin
bug fix
2023-08-15 15:08:07 +08:00
stage
整理一下
2023-04-07 15:22:56 +08:00
summon
宝箱日志上报
2023-08-07 15:33:06 +08:00
task
新手14天乐
2023-09-01 15:35:19 +08:00
tips
新增皮肤报错fix
2023-08-22 11:56:22 +08:00
tutorial
战令一键领取
2023-08-16 17:35:17 +08:00
account.meta
删除账号
2023-05-31 17:53:41 +08:00
activity.meta
整理代码
2023-04-03 10:59:13 +08:00
arena.meta
竞技场战令
2023-06-26 11:26:28 +08:00
base_module.lua
搬运一下b5的网络模块
2023-05-05 10:42:56 +08:00
base_module.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
battle.meta
整理代码
2023-04-03 10:59:13 +08:00
bounty.meta
战令
2023-05-12 15:32:53 +08:00
chapter.meta
整理代码
2023-04-03 10:59:13 +08:00
character_fsm.meta
整理代码
2023-04-03 10:59:13 +08:00
collect.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
collection.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
commerce.meta
购买体力
2023-05-09 14:52:36 +08:00
common.meta
装备副本
2023-07-19 20:16:17 +08:00
daily_challenge.meta
每日挑战
2023-05-26 15:42:35 +08:00
dungeon_armor.meta
武器副本的一些界面
2023-07-19 16:52:28 +08:00
dungeon_weapon.meta
武器副本的一些界面
2023-07-19 16:52:28 +08:00
dungeon.meta
活动副本
2023-06-12 15:39:52 +08:00
equip.meta
装备系统
2023-07-20 10:15:42 +08:00
formation.meta
战斗
2023-04-11 18:23:25 +08:00
fund.meta
基金
2023-05-24 19:19:34 +08:00
game_setting.meta
整理代码
2023-04-03 10:59:13 +08:00
gm.meta
整理代码
2023-04-03 10:59:13 +08:00
hero.meta
整理代码
2023-04-03 10:59:13 +08:00
idle.meta
整理代码
2023-04-03 10:59:13 +08:00
item.meta
整理代码
2023-04-03 10:59:13 +08:00
loading.meta
整理代码
2023-04-03 10:59:13 +08:00
login.meta
整理代码
2023-04-03 10:59:13 +08:00
mail.meta
购买体力和邮箱
2023-05-19 18:32:23 +08:00
maincity.meta
整理代码
2023-04-03 10:59:13 +08:00
player.meta
玩家升级界面
2023-05-22 16:22:26 +08:00
shop.meta
宝箱界面
2023-05-15 09:36:48 +08:00
skin.meta
皮肤功能
2023-08-09 14:16:27 +08:00
stage.meta
整理代码
2023-04-03 10:59:13 +08:00
summon.meta
提交一波
2023-05-23 16:37:01 +08:00
task.meta
整理代码
2023-04-03 10:59:13 +08:00
tips.meta
整理代码
2023-04-03 10:59:13 +08:00
tutorial.meta
整理代码
2023-04-03 10:59:13 +08:00