miduo_client/Assets/Scripts/Editor
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
..
Atlas 提交 2020-05-09 13:31:21 +08:00
CodeTools 【ios】图片回收 2021-04-21 13:12:04 +08:00
Custom 【屏幕适配】宽屏适配方案修改(需要换包) 2021-03-31 12:07:06 +08:00
CustomPrefab 提交 2020-05-09 13:31:21 +08:00
ExcelTool 服务器战斗逻辑同表工具修改 2021-05-17 10:21:23 +08:00
GameEditor 【打包】删除在打包时可以设置version内容的功能 2021-04-19 21:18:06 +08:00
LanguageTool 【本地化工具】添加不导出文件配置,gm界面不再导出翻译 2021-04-09 18:02:32 +08:00
OptTools 【资源压缩】修改ios资源压缩格式,添加重新导入工具 2021-04-19 21:17:34 +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
CodeTools.meta 【ios】图片回收 2021-04-21 13:12:04 +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 【资源压缩】修改ios资源压缩格式,添加重新导入工具 2021-04-19 21:17:34 +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 【ios】添加图片回收机制,子物体不再从缓存池中创建,修改commonatlas到dy文件夹 2021-04-20 17:13:10 +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