miduo_client/Assets/ManagedResources/EffectResSkill
jiaoyangna a05694855c Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
2021-02-20 17:55:52 +08:00
..
Effect_buff_hunluan 【资源调整】 2020-12-28 18:25:51 +08:00
Effect_c_ax_0067 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_bgj_00091 【特效】修复白骨精特效全屏显示 2020-12-26 18:33:11 +08:00
Effect_c_cff_0047 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_cff_0049 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ch_0015 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_cyh_0008 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_dhdj_00042_s1 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_fm_0027 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_gy_00092 Merge branch 'master_xma_local' into gx/xma_local 2021-02-05 14:30:05 +08:00
Effect_c_hl_00075 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jff_0050 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jll_00059 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jlzz_00060 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jpw_0024 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_mc_0034 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_mjn_00063 冲突修改提交 2020-12-07 16:29:22 +08:00
Effect_c_mlmm_0054 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_qr_0065 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_rj_0033 【特效】三四星部分特效裁切处理 2020-11-27 17:35:02 +08:00
Effect_c_swk_00015_s1 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ttjz_00048 【资源导入】 通天教主 live2d and 攻击特效 2021-01-11 15:08:53 +08:00
Effect_c_xv_00071 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_xy_0026 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_y_0013 【特效】三四星部分特效裁切处理 2020-11-27 17:35:02 +08:00
Effect_c_yff_0048 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ym_0051 【特效】三四星部分特效裁切处理 2020-11-27 17:35:02 +08:00
Effect_c_ym_0052 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_zbj_0007 【资源】资源名重复修改 2020-12-18 18:01:08 +08:00
Effect_c_zc_0021 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_zs_0080 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_01_qingluan 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
Effect_ls_03_yinglong 【特效】应龙技能受击特效改三个为一个 2020-11-02 18:08:59 +08:00
Effect_ls_04_zhulong 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
Effect_ls_05_fenghuang 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
Effect_ls_05_huodou 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_06_baize 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_08_jinwu 【特效】混乱特效添加 2020-12-26 21:03:21 +08:00
Effect_ls_08_pixiu 冲突修改提交 2020-12-07 16:29:22 +08:00
Effect_ls_09_jukun 冲突修改提交 2020-12-07 16:29:22 +08:00
Effect_ls_10_qilin 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2020-12-05 15:17:48 +08:00
Effect_tiannv 【资源导入】修改技能预设 2021-02-18 18:42:46 +08:00
Effect_buff_hunluan.meta 【特效】混乱特效添加 2020-12-26 21:03:21 +08:00
Effect_c_ax_0067.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_bgj_00091.meta 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2020-12-05 15:17:48 +08:00
Effect_c_cff_0047.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_cff_0049.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ch_0015.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_cyh_0008.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_dhdj_00042_s1.meta 【资源】孙悟空,东华帝君皮肤技能特效资源添加 2020-11-06 15:02:36 +08:00
Effect_c_fm_0027.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_gy_00092.meta 【观音】技能特效提交 2021-01-13 10:45:50 +08:00
Effect_c_hl_00075.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jff_0050.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jll_00059.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jlzz_00060.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_jpw_0024.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_mc_0034.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_mjn_00063.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_mlmm_0054.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_qr_0065.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_rj_0033.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_swk_00015_s1.meta 【资源】孙悟空,东华帝君皮肤技能特效资源添加 2020-11-06 15:02:36 +08:00
Effect_c_ttjz_00048.meta 【资源导入】 通天教主 live2d and 攻击特效 2021-01-11 15:08:53 +08:00
Effect_c_xv_00071.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_xy_0026.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_y_0013.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_yff_0048.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ym_0051.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_ym_0052.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_zbj_0007.meta 【资源导入】猪八戒新皮肤特效 2020-12-18 11:21:53 +08:00
Effect_c_zc_0021.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_c_zs_0080.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_01_qingluan.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_03_yinglong.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_04_zhulong.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_05_fenghuang.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_05_huodou.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_06_baize.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
Effect_ls_08_jinwu.meta 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2020-12-05 15:17:48 +08:00
Effect_ls_08_pixiu.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_09_jukun.meta 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
Effect_ls_10_qilin.meta 【资源导入】 新将小icon 静态卡牌例会 + 三个灵兽特效 2020-12-05 15:17:48 +08:00
Effect_tiannv.meta 【资源提交】 立绘 c_gyps_00020_s1 + 技能特效 Effect_tiannv 2021-02-18 17:06:24 +08:00