前端
Go to file Use this template
gaoxin ce13a0263e Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta
2020-07-08 19:55:09 +08:00
.vs 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
AndroidSDK 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
AssetBundles 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
Assets Merge branch '战斗优化v_n.0' into master_develop 2020-07-08 19:55:09 +08:00
BattleRecord 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
BuildABs/Android 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
FontArt 六月三号开发提交 2020-06-03 19:09:01 +08:00
Logs 提交 2020-05-09 14:12:31 +08:00
LuaEncoder 提交 2020-05-09 12:48:27 +08:00
LuaTools 提交 2020-05-09 12:48:27 +08:00
Packages 提交 2020-05-09 14:12:31 +08:00
ProjectSettings 内网 0.15.20 2020-06-23 18:36:24 +08:00
ReadMe! 内网 0.15.20 2020-06-23 18:36:24 +08:00
data_execl Merge branch '战斗优化v_n.0' into master_develop 2020-07-08 19:55:09 +08:00
obj/Debug 添加忽略文件 2020-07-03 12:00:19 +08:00
.gitignore 忽略lua数据表文件 2020-07-04 15:32:09 +08:00