miduo_client/Assets/ManagedResources/Prefabs/UI
ZhangBiao b203711459 Merge branch 'china/dev' into 0优化/商城界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-12-16 17:17:16 +08:00
..
Achievement
ActivityGift 【去除多余活动信息】 2021-12-03 16:46:40 +08:00
Adventure
Alien
Arena 巅峰赛星星修改提交 2021-11-05 13:35:14 +08:00
ArenaTopMatch 巅峰赛星星被遮挡修改 2021-11-08 15:56:18 +08:00
Bag 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
Battle [功能]=========战斗统计界面添加死亡置灰 2021-12-15 09:44:35 +08:00
BindPhoneNumber
BtView 【btview】按钮顺序调整,主城,主角,神将,关卡,副本,背包,公会 2021-11-10 16:40:38 +08:00
Carbon 【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面 2021-10-27 10:37:29 +08:00
Chat [优化]==========聊天界面称号特效显示修改 2021-08-19 14:27:56 +08:00
ChatTipView
Common 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:54 +08:00
Compound 【功能】====装备合成添加特效 2021-09-27 16:25:20 +08:00
CompoundHero
ContinuePackage 超值返利预设代码提交 2021-12-16 11:45:51 +08:00
CumulativeSignInPage
DailyRecharge 【每日豪礼】预设文字替换 2021-11-25 11:20:00 +08:00
DemonSlayer 【三界降魔】提交 2021-10-28 16:03:23 +08:00
DiffMonsterPanel
DragView
DynamicActicity 【连续礼包】新增连续礼包入口 2021-12-16 14:20:04 +08:00
EightDayGift
ElementalResonanceView
EliteMonster
Expedition 大闹天宫添加神魂等级 2021-12-06 17:47:14 +08:00
Expert 【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗 2021-10-22 13:22:39 +08:00
FetterItemView 【界面优化】好感度,天枢密卷 2021-11-02 13:41:27 +08:00
FifteenDayGift
Fight 【ID1010483】 2021-10-15 18:07:07 +08:00
FightLevel 招募秘宝提交 2021-12-10 13:41:03 +08:00
FindFairy
FindTreasure 天宫寻宝特效修改提交 2021-11-16 17:27:49 +08:00
FirstRecharge [bug]=========【ID1017466】 2021-07-19 17:34:04 +08:00
FloatingView [战斗]============战斗伤害图片字修改提交 2021-07-03 14:50:03 +08:00
Formation 【优化】轩辕宝境界面优化 2021-11-11 14:59:15 +08:00
FuXingGaoZhao
GeneralPanel 文字大小修改 2021-11-29 17:17:50 +08:00
GoodFriend
GrowthGiftPageView
Guide Revert "Revert "【界面优化】剧情界面、引导、itemview、邮件、背包"" 2021-11-01 18:59:16 +08:00
Guild 【ID1010715】 2021-12-02 15:31:23 +08:00
HandBook Merge branch 'china/dev' into 0功能/神魂 2021-11-04 09:29:56 +08:00
Harmony 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
HarmonyView 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
HeroView 神魂提交 2021-11-05 10:18:10 +08:00
HorseRaceLampView
HunterRoadView
ItemView 【挂机物品】添加时间标签 2021-12-26 17:13:30 +08:00
JourneyWithWind 【缥缈之旅】替换资源 2021-07-06 10:22:17 +08:00
JumpServer 【灵脉秘境】提交 2021-11-19 17:01:10 +08:00
JumpView 【道具来源】界面错位修改 2021-11-02 14:47:27 +08:00
Likability 法宝聚灵提交 2021-11-19 11:37:26 +08:00
LingMaiMiJin 【灵脉秘境】1号灵脉的灵气数值超框 2021-12-02 19:49:49 +08:00
Loading
Login 【弹窗优化】公会、公告、服务器列表】英雄信息 2021-10-22 13:53:10 +08:00
LuckyCat
LuckyTurnTable 【ID1009791】 2021-07-13 10:39:30 +08:00
Mail Revert "Revert "【界面优化】剧情界面、引导、itemview、邮件、背包"" 2021-11-01 18:59:16 +08:00
Main 添加一个按钮 2021-12-13 16:31:41 +08:00
Map 【森罗幻境】修复英雄选框底图消失问题 2021-12-14 10:05:49 +08:00
MapFight
Message 【弹窗优化】提交 2021-10-22 14:22:12 +08:00
Mission 【界面优化】提交 2021-11-02 11:06:13 +08:00
MoneyNumView
MonsterCamp 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
MonthCardPageView 【周卡】周卡数量显示位置优化 2021-11-05 11:27:48 +08:00
NewActivity 【商城界面】提交 2021-12-16 10:46:11 +08:00
NewItemView
NiuQiChongTian 【去除多余活动信息】 2021-12-03 16:46:40 +08:00
NiuZhuanQianKun
NumTextPreView
NumberView
OnlineReward
Operating
PlayerHeadView
PlayerInfoView 【修行】图标调整 2021-06-02 11:08:24 +08:00
PlayerLiveView Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
Pokemon 【ID1019165】 2021-11-16 16:40:34 +08:00
Popup 至尊降世修改提交 2021-12-16 16:55:30 +08:00
Power 神魂星星修改提交 2021-11-05 17:13:49 +08:00
Practice 【修行】结构修改 2021-12-06 13:02:18 +08:00
Pray
QiJieShiLian 【七界试炼】左右按钮在调整 2021-10-21 17:55:11 +08:00
Questionnaire
QuickPurchase Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"" 2021-11-01 18:59:11 +08:00
Ranking 【灵脉秘境】提交 2021-11-18 15:45:21 +08:00
RechargeView 【商城界面】提交 2021-12-15 14:34:21 +08:00
Recruit 四元阵特效修改提交 2021-08-31 10:54:32 +08:00
Resolve 送神祠星级修改 2021-11-05 15:48:22 +08:00
RewardBox 图片修改提交 2021-11-27 13:54:36 +08:00
RewardPanel
RoleInfo 预设修改提交 2021-12-15 10:28:26 +08:00
RoleItemView
SacredTree 适配修改 2021-09-02 11:38:49 +08:00
ScrollCycleView
SecretBox
Setting 【界面修改】坐骑、白骨精法宝 2021-11-05 16:24:14 +08:00
SevenDayCarnival
Shop
ShopItemView
ShopView 添加已获得标志 2021-12-06 16:04:01 +08:00
SoulPrint 【界面优化】魂印图鉴界面 2021-11-02 15:14:19 +08:00
SoulPrintAstrology
Story 【对话】显示异常修复 2021-11-29 15:57:54 +08:00
SurpriseBox 【惊喜礼盒】底部回弹位置低 2021-06-18 15:06:53 +08:00
TaSuiLingXiao
TailsmanSoulView 【法宝聚灵】增加特效 2021-12-13 12:14:46 +08:00
TeHuiShenZhuang 【活动】连续礼包,添加 2021-12-02 01:44:29 +08:00
TianShuMiJuan 变身卡界面修改提交 2021-11-27 16:14:59 +08:00
TimeLimitSkin
TreasureOfHeaven 去掉帮助按钮,修改文字 2021-12-14 09:35:35 +08:00
TreasureOfSomebody
TreasureStore 【百宝商会】修改提交 2021-11-05 11:16:30 +08:00
UIComponent
UIRoot Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +08:00
UpGradePackage
UpView
UppperMonthCardView 超值基金特效修改 2021-07-16 14:28:26 +08:00
View 神魂位置错误修改 2021-11-08 13:43:45 +08:00
Vip 【线上】【特权】属性加成位置缺少黑色半透图层 2021-06-09 11:20:05 +08:00
WarPowerChange
WorldArena 【玉虚论道】界面切边修改 2021-11-11 13:40:37 +08:00
WorldCelebration
XiaoYao 【逍遥游】图标层级错误修改 2021-11-05 16:49:38 +08:00
XunBaoMiZong 【寻宝迷踪】增加珍奇宝阁入口 2021-12-06 18:44:33 +08:00
YuJianXing 【连购礼包】提交 2021-12-03 13:21:15 +08:00
ZhiZunHaoLi
cardView
linglong 预设漏提 2021-11-02 14:24:27 +08:00
starGridView 神魂提交 2021-11-05 10:18:10 +08:00
Achievement.meta
ActivityGift.meta
Adventure.meta
Alien.meta
Arena.meta
ArenaTopMatch.meta
Bag.meta
Battle.meta
BindPhoneNumber.meta
BtView.meta
Carbon.meta
Chat.meta
ChatTipView.meta
Common.meta
Compound.meta
CompoundHero.meta
ContinuePackage.meta 【连购礼包】提交 2021-12-02 14:03:38 +08:00
CumulativeSignInPage.meta
DailyRecharge.meta
DemonSlayer.meta
DiffMonsterPanel.meta
DragView.meta
DynamicActicity.meta
EightDayGift.meta
ElementalResonanceView.meta
EliteMonster.meta
Expedition.meta
Expert.meta
FetterItemView.meta
FifteenDayGift.meta
Fight.meta
FightLevel.meta
FindFairy.meta
FindTreasure.meta
FirstRecharge.meta
FloatingView.meta
Formation.meta
FuXingGaoZhao.meta
GeneralPanel.meta
GoodFriend.meta
GrowthGiftPageView.meta
Guide.meta
Guild.meta
HandBook.meta
Harmony.meta
HarmonyView.meta
HeroView.meta
HorseRaceLampView.meta
HunterRoadView.meta
ItemView.meta
JourneyWithWind.meta 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
JumpServer.meta 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
JumpView.meta
Likability.meta 好感度提交 2021-09-26 09:54:58 +08:00
LingMaiMiJin.meta 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
Loading.meta
Login.meta
LuckyCat.meta
LuckyTurnTable.meta
Mail.meta
Main.meta
Map.meta
MapFight.meta
Message.meta .meta 2021-09-22 15:39:07 +08:00
Mission.meta
MoneyNumView.meta
MonsterCamp.meta
MonthCardPageView.meta
NewActivity.meta
NewItemView.meta
NiuQiChongTian.meta
NiuZhuanQianKun.meta
NumTextPreView.meta
NumberView.meta
OnlineReward.meta
Operating.meta
PlayerHeadView.meta
PlayerInfoView.meta
PlayerLiveView.meta
Pokemon.meta
Popup.meta
Power.meta
Practice.meta
Pray.meta
QiJieShiLian.meta 【七界试炼】提交 2021-09-06 11:37:49 +08:00
Questionnaire.meta
QuickPurchase.meta
Ranking.meta
RechargeView.meta
Recruit.meta
Resolve.meta
RewardBox.meta
RewardPanel.meta
RoleInfo.meta
RoleItemView.meta
SacredTree.meta
ScrollCycleView.meta
SecretBox.meta
Setting.meta
SevenDayCarnival.meta
Shop.meta
ShopItemView.meta
ShopView.meta
SoulPrint.meta
SoulPrintAstrology.meta
Story.meta
SurpriseBox.meta 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
TaSuiLingXiao.meta
TailsmanSoulView.meta 法宝聚灵提交 2021-11-19 11:37:26 +08:00
TeHuiShenZhuang.meta 【特惠神装】提交 2021-06-30 18:38:20 +08:00
TianShuMiJuan.meta
TimeLimitSkin.meta
TreasureOfHeaven.meta
TreasureOfSomebody.meta
TreasureStore.meta
UIComponent.meta
UIRoot.meta
UpGradePackage.meta
UpView.meta
UppperMonthCardView.meta
View.meta .meta 2021-09-18 15:44:29 +08:00
Vip.meta
WarPowerChange.meta
WorldArena.meta 文件夹提交 2021-08-24 17:36:20 +08:00
WorldCelebration.meta
XiaoYao.meta
XunBaoMiZong.meta Revert Revert 回滚错误的合并 4f19f12612 2021-09-15 14:29:14 +08:00
YuJianXing.meta 【御剑行】资源提交 2021-09-26 17:39:49 +08:00
ZhiZunHaoLi.meta
cardView.meta
linglong.meta 玲珑宝镜修改提交 2021-06-10 15:36:59 +08:00
starGridView.meta