miduo_client/Assets/ManagedResources/~Lua/Message
ZhangBiao 246f19b256 Merge branch '0活动开发聚集地/新将活动3个' into master_develop
# Conflicts:
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/BoWenQiangShi.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_02.prefab.meta
#	Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab_prefab.prefab.meta
#	Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab.meta
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto.meta
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/Expedition.proto.meta
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/gtGprotos.meta
#	Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Message/gtwprotos.meta
#	Assets/ManagedResources/~Lua/Message/gtwprotos/WorldProto_pb.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua.meta
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua.meta
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua.meta
2020-12-23 15:27:52 +08:00
..
gtGprotos 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
gtwprotos 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
ActivityProto_pb.lua 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
ActivityProto_pb.lua.meta 【社稷大典】提交4 2020-10-24 18:41:21 +08:00
ArenaInfoProto_pb.lua 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
ArenaInfoProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
ChatProto_pb.lua 【战报系统】代码添加 2020-12-17 18:36:08 +08:00
ChatProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
CommonProto_pb.lua 【协议】战斗协议添加id字段 2020-12-18 19:38:18 +08:00
CommonProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
Expedition_pb.lua 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
Expedition_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
Family_pb.lua 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
Family_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
FightInfoProto_pb.lua 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
FightInfoProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
HeroInfoProto_pb.lua 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
HeroInfoProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
MapInfoProto_pb.lua 【森罗幻境】诸多bug 修复 2020-12-12 18:00:18 +08:00
MapInfoProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
MessageTypeProto_pb.lua 提交协议 2020-12-16 20:37:36 +08:00
MessageTypeProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
PlayerInfoProto_pb.lua 【跨服天梯】提交 2020-12-16 11:28:57 +08:00
PlayerInfoProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
RoomFightProto_pb.lua 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
RoomFightProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
RoomProto_pb.lua 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
RoomProto_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
SceneFight_pb.lua 【跨服天梯】资源预设提交 2020-11-19 18:30:19 +08:00
SceneFight_pb.lua.meta 提交 2020-05-09 13:31:21 +08:00
gtGprotos.meta 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00
gtwprotos.meta 【降妖夺宝】结束 2020-12-23 10:34:47 +08:00