miduo_client/Assets/ManagedResources/Prefabs/UI/View
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
..
BtView.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
BtView.prefab.meta
ChatTipView.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
ChatTipView.prefab.meta
CumulativeSignInPage.prefab 签到 修改 2021-04-01 18:50:06 +08:00
CumulativeSignInPage.prefab.meta 活动提交 2021-03-30 10:48:34 +08:00
DragView.prefab
DragView.prefab.meta
ElementalResonanceView.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
ElementalResonanceView.prefab.meta
FetterItem.prefab 天书秘卷预设修改 2021-04-07 11:12:14 +08:00
FetterItem.prefab.meta 天书秘卷 2021-03-19 14:37:24 +08:00
GrowthGiftPage.prefab 活动 提交 2021-03-30 18:26:10 +08:00
GrowthGiftPage.prefab.meta 活动提交 2021-03-30 10:48:34 +08:00
HarmonyView.prefab 【适配】鸿蒙阵屏幕适配修改 2021-03-07 16:19:53 +08:00
HarmonyView.prefab.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
Hero.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
Hero.prefab.meta
HorseRaceLamp.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
HorseRaceLamp.prefab.meta
HunterRoadView.prefab
HunterRoadView.prefab.meta
ItemView.prefab 【活动优化】日周月礼包增加角标及妖晶数量变更 2021-04-09 11:05:08 +08:00
ItemView.prefab.meta
JumpView.prefab 【本地化】page12 14 jumpview 2021-02-25 13:31:27 +08:00
JumpView.prefab.meta
MoneyNumView.prefab 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
MoneyNumView.prefab.meta 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
MonthCardPage.prefab 【bug 主要是翻译】 2021-04-07 16:38:26 +08:00
MonthCardPage.prefab.meta 活动提交 2021-03-30 10:48:34 +08:00
NewItem.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
NewItem.prefab.meta
NumTextPre.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
NumTextPre.prefab.meta 【本地化】预设提交 2021-01-26 17:48:24 +08:00
NumberView.prefab
NumberView.prefab.meta
PlayerHead.prefab
PlayerHead.prefab.meta
PlayerInfoView.prefab 【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i 2021-03-30 19:54:19 +08:00
PlayerInfoView.prefab.meta 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
PlayerLiveView.prefab 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
PlayerLiveView.prefab.meta
RechargeView.prefab 活动提交 2021-03-30 10:48:34 +08:00
RechargeView.prefab.meta 活动提交 2021-03-30 10:48:34 +08:00
RewardPanel.prefab 签到界面宝箱弹出框修改 2021-04-02 14:04:21 +08:00
RewardPanel.prefab.meta 签到 修改 2021-04-01 18:50:06 +08:00
RoleItemView.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
RoleItemView.prefab.meta
ScrollCycleView.prefab
ScrollCycleView.prefab.meta
ShopItemView.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
ShopItemView.prefab.meta
ShopView.prefab 公会商店本地化修改提交 2021-02-23 20:50:34 +08:00
ShopView.prefab.meta
UpView.prefab 屏幕适配修改 2020-09-02 20:27:21 +08:00
UpView.prefab.meta
UppperMonthCard.prefab 超值基金文字错乱修改 2021-03-31 15:24:05 +08:00
UppperMonthCard.prefab.meta 活动 修改提交 2021-03-30 20:17:26 +08:00
card.prefab 【本地化】预设提交 2021-01-26 17:48:24 +08:00
card.prefab.meta 添加特效 2020-07-28 15:06:47 +08:00
starGrid.prefab 【觉醒】问题修改 2020-11-12 13:55:46 +08:00
starGrid.prefab.meta 修改星星提交 2020-07-24 20:03:06 +08:00