miduo_client/Assets/ManagedResources/Atlas/FourElement
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
..
ArtFont Merge branch 'china/dev-c' into 0功能/silingshilian 2021-05-24 16:39:34 +08:00
ArtFont.meta 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00
s_silingshilian_daodi.png 四灵提交 2021-02-04 15:12:37 +08:00
s_silingshilian_daodi.png.meta 四灵提交 2021-02-04 15:12:37 +08:00
s_silingshilian_daoxuanshiliandi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_daoxuanshiliandi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_di.jpg 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_di.jpg.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_di3.png 【心魔试炼】 2021-06-09 19:48:28 +08:00
s_silingshilian_di3.png.meta 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
s_silingshilian_fochanshiliandi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_fochanshiliandi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_fodi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_fodi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_qizhi.png 【心魔试炼】 2021-06-09 19:48:28 +08:00
s_silingshilian_qizhi.png.meta 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
s_silingshilian_rendi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_rendi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_renjieshiliandi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_renjieshiliandi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_shiliandi.png 【心魔试炼】资源替换 2021-06-30 16:03:40 +08:00
s_silingshilian_shiliandi.png.meta 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
s_silingshilian_shilianjianglidi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_shilianjianglidi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_shoudi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_shoudi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_xmsl_zh.png 【心魔试炼】资源替换2 2021-06-30 16:29:37 +08:00
s_silingshilian_xmsl_zh.png.meta 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
s_silingshilian_yaodi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_yaodi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_yaolingshiliandi.png 四灵试炼 提交 2020-12-21 10:37:37 +08:00
s_silingshilian_yaolingshiliandi.png.meta 四灵试炼 提交 2020-12-21 10:37:37 +08:00