puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/config
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
..
localization
编译
2023-06-13 14:38:38 +08:00
strings
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
act_chapter_store.lua.bytes
编译
2023-06-05 21:33:50 +08:00
act_chapter_store.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
act_gift.lua.bytes
编译lua
2023-06-06 15:06:56 +08:00
act_gift.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
act_gold_pig.lua.bytes
通用技能tips
2023-05-22 16:38:42 +08:00
act_gold_pig.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
act_growup_gift.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
act_growup_gift.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
act_level_fund.lua.bytes
金猪完成
2023-05-23 18:22:06 +08:00
act_level_fund.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
act_sevenday_quest_reward.lua.bytes
编译
2023-05-25 15:27:25 +08:00
act_sevenday_quest_reward.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
act_sevenday_quest.lua.bytes
七天乐
2023-05-30 22:23:55 +08:00
act_sevenday_quest.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
attr.lua.bytes
更新配置
2023-05-31 09:34:42 +08:00
attr.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
avatar_frame.lua.bytes
编译
2023-06-13 14:38:38 +08:00
avatar_frame.lua.bytes.meta
编译
2023-06-13 14:38:38 +08:00
avatar.lua.bytes
编译
2023-06-13 14:38:38 +08:00
avatar.lua.bytes.meta
编译
2023-06-13 14:38:38 +08:00
battle_exp.lua.bytes
编译
2023-04-21 16:30:58 +08:00
battle_exp.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
bounty_level.lua.bytes
编译lua
2023-06-06 15:06:56 +08:00
bounty_level.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
bounty_time.lua.bytes
编译lua
2023-06-06 15:06:56 +08:00
bounty_time.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
buff_daily_challenge.lua.bytes
bug修复
2023-06-01 17:26:16 +08:00
buff_daily_challenge.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
buff.lua.bytes
邮箱
2023-06-03 23:54:18 +08:00
buff.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
chapter_board_daily_challenge.lua.bytes
编译
2023-06-06 18:44:31 +08:00
chapter_board_daily_challenge.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
chapter_board_dungeon_gold.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
chapter_board_dungeon_gold.lua.bytes.meta
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
chapter_board_dungeon_shards.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
chapter_board_dungeon_shards.lua.bytes.meta
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
chapter_board.lua.bytes
技能音效
2023-06-13 17:44:37 +08:00
chapter_board.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
chapter_daily_challenge.lua.bytes
编译
2023-06-06 11:46:17 +08:00
chapter_daily_challenge.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
chapter_dungeon_gold.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
chapter_dungeon_gold.lua.bytes.meta
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
chapter_dungeon_shards.lua.bytes
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
chapter_dungeon_shards.lua.bytes.meta
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
chapter.lua.bytes
编译
2023-06-13 14:38:38 +08:00
chapter.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
const.lua.bytes
编译
2023-06-13 14:38:38 +08:00
const.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
func_open.lua.bytes
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
func_open.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
fx.lua.bytes
编译
2023-06-06 18:44:31 +08:00
fx.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
grid_type.lua.bytes
技能音效
2023-06-13 17:44:37 +08:00
grid_type.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
hero_level.lua.bytes
编译
2023-05-18 22:11:58 +08:00
hero_level.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
hero.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
hero.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
item.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
item.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
localization.meta
整理项目
2023-04-03 11:04:31 +08:00
mail.lua.bytes
更新配置
2023-06-05 15:54:49 +08:00
mail.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
mall_daily.lua.bytes
编译
2023-05-25 15:27:25 +08:00
mall_daily.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
mall_gold.lua.bytes
编译lua
2023-06-06 15:06:56 +08:00
mall_gold.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
mall_treasure.lua.bytes
编译
2023-05-25 15:27:25 +08:00
mall_treasure.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
monster_base.lua.bytes
更新配置
2023-05-30 21:30:41 +08:00
monster_base.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
monster_chapter.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
monster_chapter.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
monster_daily_challenge.lua.bytes
先更新一下格子
2023-06-02 16:54:59 +08:00
monster_daily_challenge.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
monster_dungeon_gold.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
monster_dungeon_gold.lua.bytes.meta
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
monster_dungeon_shards.lua.bytes
新的肉鸽机制-改变effect概率
2023-06-13 11:11:46 +08:00
monster_dungeon_shards.lua.bytes.meta
每日挑战不显示每日buff信息
2023-06-12 09:47:25 +08:00
player_exp.lua.bytes
编译
2023-05-25 15:27:25 +08:00
player_exp.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
player_initial.lua.bytes
设置界面
2023-05-08 21:11:13 +08:00
player_initial.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
recharge.lua.bytes
更新配置
2023-05-31 14:32:33 +08:00
recharge.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
recovery.lua.bytes
编译
2023-04-19 20:51:38 +08:00
recovery.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
skill_rogue.lua.bytes
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
skill_rogue.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
skill.lua.bytes
Merge branch 'dev' into fang/dungeon
2023-06-14 11:42:03 +08:00
skill.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
strings.meta
整理项目
2023-04-03 11:04:31 +08:00
struct.lua.bytes
编译
2023-05-18 20:32:53 +08:00
struct.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
summon_exp.lua.bytes
编译
2023-06-05 21:33:50 +08:00
summon_exp.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
summon.lua.bytes
编译
2023-06-05 21:33:50 +08:00
summon.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
task_daily_challenge.lua.bytes
编译
2023-06-06 18:44:31 +08:00
task_daily_challenge.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
task_daily.lua.bytes
金猪完成
2023-05-23 18:22:06 +08:00
task_daily.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
task.lua.bytes
编译
2023-06-06 10:49:52 +08:00
task.lua.bytes.meta
boss入场动画
2023-05-22 20:32:26 +08:00
tutorial_start.lua.bytes
更新配置
2023-06-05 10:08:06 +08:00
tutorial_start.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00
tutorial.lua.bytes
编译
2023-06-06 18:44:31 +08:00
tutorial.lua.bytes.meta
资源处理和ab name
2023-04-21 22:55:50 +08:00