puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/module
History
Fang ee97ab1c93 Merge branch 'dev' into fang/dungeon 
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
..
account
fix bug
2023-06-07 19:50:16 +08:00
activity
七天乐
2023-05-26 15:40:44 +08:00
battle
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
bounty
编译
2023-06-06 18:44:31 +08:00
chapter
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
character_fsm
整理项目
2023-04-03 11:04:31 +08:00
commerce
编译
2023-05-24 21:51:20 +08:00
daily_challenge
更新协议
2023-06-12 16:53:24 +08:00
dungeon
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
formation
编译
2023-06-08 21:38:54 +08:00
fund
ab name
2023-05-30 21:15:29 +08:00
game_setting
cdkey临时界面
2023-06-13 20:54:29 +08:00
gm
增加棋盘查看字段
2023-06-05 21:08:16 +08:00
hero
编译
2023-06-08 21:38:54 +08:00
idle
更新pb
2023-05-19 18:23:35 +08:00
item
编译
2023-06-01 10:01:04 +08:00
loading
整理项目
2023-04-03 11:04:31 +08:00
login
对手先手期间，英雄不会播放死亡动作bug修复
2023-06-14 10:03:52 +08:00
mail
编译
2023-05-22 21:25:43 +08:00
maincity
界面处理
2023-06-13 10:20:17 +08:00
player
战斗退出后显示主界面控制
2023-06-06 17:31:34 +08:00
shop
merge
2023-06-13 10:45:07 +08:00
stage
资源处理和ab name
2023-04-21 22:55:50 +08:00
summon
编译
2023-05-31 15:43:07 +08:00
task
任务没开启前不显示任务完成得toast
2023-05-29 12:06:51 +08:00
tips
编译
2023-06-08 21:38:54 +08:00
tutorial
每日挑战引导
2023-06-05 11:05:17 +08:00
account.meta
账号删除
2023-05-31 17:54:31 +08:00
activity.meta
整理项目
2023-04-03 11:04:31 +08:00
base_module.lua.bytes
编译
2023-05-05 15:39:51 +08:00
base_module.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
battle.meta
整理项目
2023-04-03 11:04:31 +08:00
bounty.meta
编译lua
2023-05-12 20:30:10 +08:00
chapter.meta
整理项目
2023-04-03 11:04:31 +08:00
character_fsm.meta
整理项目
2023-04-03 11:04:31 +08:00
commerce.meta
购买体力
2023-05-09 14:54:14 +08:00
daily_challenge.meta
每日挑战
2023-05-30 11:45:27 +08:00
dungeon.meta
界面处理
2023-06-13 10:20:17 +08:00
formation.meta
修复一些报错
2023-04-11 20:33:59 +08:00
fund.meta
基金界面
2023-05-24 19:26:13 +08:00
game_setting.meta
整理项目
2023-04-03 11:04:31 +08:00
gm.meta
整理项目
2023-04-03 11:04:31 +08:00
hero.meta
整理项目
2023-04-03 11:04:31 +08:00
idle.meta
整理项目
2023-04-03 11:04:31 +08:00
item.meta
整理项目
2023-04-03 11:04:31 +08:00
loading.meta
整理项目
2023-04-03 11:04:31 +08:00
login.meta
整理项目
2023-04-03 11:04:31 +08:00
mail.meta
更新资源
2023-05-19 20:00:57 +08:00
maincity.meta
整理项目
2023-04-03 11:04:31 +08:00
player.meta
通用技能tips
2023-05-22 16:38:42 +08:00
shop.meta
商城
2023-05-15 09:37:20 +08:00
stage.meta
整理项目
2023-04-03 11:04:31 +08:00
summon.meta
格挡动作表现、反击界面表现
2023-05-23 16:40:45 +08:00
task.meta
整理项目
2023-04-03 11:04:31 +08:00
tips.meta
整理项目
2023-04-03 11:04:31 +08:00
tutorial.meta
整理项目
2023-04-03 11:04:31 +08:00