前端
Go to file Use this template
jiaoyangna 8e0047d5e8 Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
2021-01-26 14:48:06 +08:00
.vs 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
AndroidSDK 新出包需求添加,sdk结构修改 2020-07-23 17:16:47 +08:00
AssetBundles 测试服包版本修改 2020-09-05 17:24:09 +08:00
Assets Merge branch 'master_xma_local' into 0功能/silingshilian 2021-01-26 14:48:06 +08:00
BattleRecord 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
FontArt 战斗怒气文字修改 2020-08-27 17:26:55 +08:00
KeyStore 修改登录时注销sdk无法重新登录的问题 2020-07-22 11:42:37 +08:00
Logs 提交 2020-05-09 14:12:31 +08:00
LuaEncoder lujit添加对64位代码的支持 2020-08-29 15:10:01 +08:00
LuaTools 提交 2020-05-09 12:48:27 +08:00
Packages 提交 2020-05-09 14:12:31 +08:00
ProjectSettings 场景提交 2020-09-04 15:01:59 +08:00
ReadMe! 新aar资源替换 2020-07-28 17:30:06 +08:00
data_execl 遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-27 16:14:42 +08:00
obj/Debug 资源提交, 2020-08-14 17:35:18 +08:00
.gitignore 打包资源不再跟踪 2020-08-24 18:01:07 +08:00