miduo_client/Assets/Scripts/Editor
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
..
Atlas 提交 2020-05-09 13:31:21 +08:00
Custom 【屏幕适配】宽屏适配方案修改(需要换包) 2021-03-31 12:07:06 +08:00
CustomPrefab 提交 2020-05-09 13:31:21 +08:00
ExcelTool 【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题 2021-03-29 10:47:39 +08:00
GameEditor 【工具】刷新资源路径工具不再自动重命名 2021-03-08 14:34:02 +08:00
LanguageTool 【资源导入工具】资源导入时自动设置压缩格式,修复本地化资源导入工具导入资源缓存不清除的问题 2021-03-29 17:58:48 +08:00
OptTools 提交 2020-05-09 13:31:21 +08:00
SpineTool 提交 2020-05-09 13:31:21 +08:00
UGUI 提交 2020-05-09 13:31:21 +08:00
UGUIFontEditor 提交 2020-05-09 13:31:21 +08:00
XUPorter 删除无用的sdk资源,bugly添加缺少的文件 2020-08-11 14:04:05 +08:00
Atlas.meta 提交 2020-05-09 13:31:21 +08:00
CreateFont.cs 提交 2020-05-09 13:31:21 +08:00
CreateFont.cs.meta 提交 2020-05-09 13:31:21 +08:00
Custom.meta 提交 2020-05-09 13:31:21 +08:00
CustomImportSettings.cs 【资源导入工具】资源导入时自动设置压缩格式,修复本地化资源导入工具导入资源缓存不清除的问题 2021-03-29 17:58:48 +08:00
CustomImportSettings.cs.meta 提交 2020-05-09 13:31:21 +08:00
CustomPrefab.meta 提交 2020-05-09 13:31:21 +08:00
DefaultPackerPolicySampleToNormal.cs 提交 2020-05-09 13:31:21 +08:00
DefaultPackerPolicySampleToNormal.cs.meta 提交 2020-05-09 13:31:21 +08:00
EffectResTools.cs 【工具】特效资源整理工具 2021-03-08 14:37:38 +08:00
EffectResTools.cs.meta 【工具】特效资源整理工具 2021-03-08 14:37:38 +08:00
ExcelTool.meta 提交 2020-05-09 13:31:21 +08:00
FindNoReferenceAssetWindow.cs 提交 2020-05-09 13:31:21 +08:00
FindNoReferenceAssetWindow.cs.meta 提交 2020-05-09 13:31:21 +08:00
FindReferences.cs 【工具】特效资源整理工具 2021-03-08 14:37:38 +08:00
FindReferences.cs.meta 提交 2020-05-09 13:31:21 +08:00
GameEditor.meta 提交 2020-05-09 13:31:21 +08:00
GameSettingInspector.cs 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
GameSettingInspector.cs.meta 提交 2020-05-09 13:31:21 +08:00
GenConfig.cs 提交 2020-05-09 13:31:21 +08:00
GenConfig.cs.meta 提交 2020-05-09 13:31:21 +08:00
GenVsSolution.cs 提交 2020-05-09 13:31:21 +08:00
GenVsSolution.cs.meta 提交 2020-05-09 13:31:21 +08:00
ImportSpine.cs qinglong commit 2020-08-24 20:10:52 +08:00
ImportSpine.cs.meta 动态立绘提交 2020-08-14 12:59:19 +08:00
LanguageTool.meta 提交 2020-05-09 13:31:21 +08:00
OptTools.meta 提交 2020-05-09 13:31:21 +08:00
SelectFileWin.cs 动态立绘提交 2020-08-14 12:59:19 +08:00
SelectFileWin.cs.meta 动态立绘提交 2020-08-14 12:59:19 +08:00
SpineTool.meta 提交 2020-05-09 13:31:21 +08:00
TestJson.cs 提交 2020-05-09 13:31:21 +08:00
TestJson.cs.meta 提交 2020-05-09 13:31:21 +08:00
TextureSizeOptTools.cs 资源提交, 2020-08-14 17:35:18 +08:00
TextureSizeOptTools.cs.meta 添加图片优化工具 2020-07-28 17:57:02 +08:00
UGUI.meta 提交 2020-05-09 13:31:21 +08:00
UGUIFontEditor.meta 提交 2020-05-09 13:31:21 +08:00
UGuiRectTransformTool.cs 提交 2020-05-09 13:31:21 +08:00
UGuiRectTransformTool.cs.meta 提交 2020-05-09 13:31:21 +08:00
UIColors.colors 提交 2020-05-09 13:31:21 +08:00
UIColors.colors.meta 提交 2020-05-09 13:31:21 +08:00
XUPorter.meta 提交 2020-05-09 13:31:21 +08:00
convertutf8.cs convertutf8..cs 提交 2020-08-07 15:19:25 +08:00
convertutf8.cs.meta 代码转utf8格式 2020-08-06 17:59:23 +08:00