puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/module
History
xiekaidong 26862b0e02 Merge branch 'dev_20230815' into battle 
# Conflicts:
#	lua/app/config/buff.lua
#	lua/app/config/strings/de/buff.lua
#	lua/app/config/strings/en/buff.lua
#	lua/app/config/strings/es/buff.lua
#	lua/app/config/strings/fr/buff.lua
#	lua/app/config/strings/id/buff.lua
#	lua/app/config/strings/ja/buff.lua
#	lua/app/config/strings/ko/buff.lua
#	lua/app/config/strings/pt/buff.lua
#	lua/app/config/strings/ru/buff.lua
#	lua/app/config/strings/th/buff.lua
#	lua/app/config/strings/vi/buff.lua
#	lua/app/config/strings/zh/buff.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/helper/battle_buff_handle.lua
2023-08-08 16:02:24 +08:00
..
account
Merge branch 'fang/dungeon' of http://git.juzugame.com/b6-client/b6-lua into fang/dungeon
2023-06-12 15:43:30 +08:00
activity
日志上报
2023-08-03 14:20:16 +08:00
arena
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
battle
Merge branch 'dev_20230815' into battle
2023-08-08 16:02:24 +08:00
bounty
宝箱日志上报
2023-08-07 15:33:06 +08:00
chapter
战斗续关
2023-07-31 16:22:05 +08:00
character_fsm
棋盘
2023-04-06 10:38:04 +08:00
collection
英雄图鉴
2023-07-14 17:07:03 +08:00
commerce
添加一些容错
2023-07-24 17:04:40 +08:00
common
添加音效
2023-08-01 11:10:51 +08:00
daily_challenge
添加一些容错
2023-07-24 17:04:40 +08:00
dungeon
增加上报属性
2023-08-07 10:35:11 +08:00
dungeon_armor
增加上报属性
2023-08-07 10:35:11 +08:00
dungeon_weapon
增加上报属性
2023-08-07 10:35:11 +08:00
equip
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +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
增加gm
2023-07-31 14:11:25 +08:00
hero
木兰试玩增加至5章
2023-08-02 16:13:23 +08:00
idle
体力不足得时候弹出来购买体力界面
2023-05-19 17:08:19 +08:00
item
新增上报
2023-08-07 18:15:19 +08:00
loading
整理代码
2023-04-03 10:59:13 +08:00
login
新增上报
2023-08-07 18:15:19 +08:00
mail
邮件拉去增加一个随机延时
2023-07-28 11:16:21 +08:00
maincity
装备礼包
2023-07-21 09:35:21 +08:00
player
添加头像、头像框道具解锁逻辑
2023-07-07 11:04:22 +08:00
shop
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
stage
整理一下
2023-04-07 15:22:56 +08:00
summon
宝箱日志上报
2023-08-07 15:33:06 +08:00
task
修复任务没开启前会显示任务完成得toast
2023-05-29 12:05:26 +08:00
tips
优化显示
2023-08-02 18:56:28 +08:00
tutorial
副本引导
2023-07-24 17:10:39 +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
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