puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app
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
..
bf
增加容错
2023-07-28 10:49:14 +08:00
common
新增上报
2023-08-07 18:15:19 +08:00
config
Merge branch 'dev_20230815' into battle
2023-08-08 16:02:24 +08:00
first
首包界面
2023-07-07 15:46:58 +08:00
global
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
hotfix
注释和删除中文
2023-06-20 20:18:11 +08:00
module
Merge branch 'dev_20230815' into battle
2023-08-08 16:02:24 +08:00
net
修复一下报错问题
2023-07-24 18:01:07 +08:00
proto
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
scene
整理代码
2023-04-03 10:59:13 +08:00
tools
整理一下
2023-04-07 15:22:56 +08:00
ui
Merge branch 'dev_20230815' into battle
2023-08-08 16:02:24 +08:00
userdata
Merge branch 'dev_20230815' into battle
2023-08-08 16:02:24 +08:00
bf.meta
整理代码
2023-04-03 10:59:13 +08:00
common.meta
整理代码
2023-04-03 10:59:13 +08:00
config.meta
整理代码
2023-04-03 10:59:13 +08:00
first.meta
整理代码
2023-04-03 10:59:13 +08:00
game.lua
木棍边缘障碍物
2023-08-02 18:07:44 +08:00
game.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
global.meta
整理代码
2023-04-03 10:59:13 +08:00
hotfix.meta
整理代码
2023-04-03 10:59:13 +08:00
module.meta
整理代码
2023-04-03 10:59:13 +08:00
net.meta
整理代码
2023-04-03 10:59:13 +08:00
proto.meta
整理代码
2023-04-03 10:59:13 +08:00
scene.meta
整理代码
2023-04-03 10:59:13 +08:00
tools.meta
整理代码
2023-04-03 10:59:13 +08:00
ui.meta
整理代码
2023-04-03 10:59:13 +08:00
userdata.meta
整理代码
2023-04-03 10:59:13 +08:00