miduo_client/Assets/ManagedResources/~Lua/Modules
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
..
Achievement
ActivityGift Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
Adventure 至尊降世添加拍脸 2021-12-20 13:41:16 +08:00
Alien
Arena [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
ArenaTopMatch 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
Bag 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
Battle Merge branch 'china/dev' into china/飞升 2022-01-15 18:16:56 +08:00
BindPhone
Carbon 【日常副本】列表动画添加 2022-01-13 12:04:22 +08:00
Chat
Common
Compound 【装备合成】添加输入改变合成数量的功能 2021-12-30 22:19:09 +08:00
CompoundHero 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
ContinuePackage 【主题活动】0120-0202寻宝迷踪珍奇宝阁报错 2022-01-15 15:53:28 +08:00
DailyRecharge 【云梦豪礼】每日添加红点提示 2022-01-14 14:00:13 +08:00
DataCenterService
DemonSlayer
DiffMonster
DynamicActivity 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
EightDay
EliteMonster
Equip 【家园】提交 2022-01-05 19:12:54 +08:00
Expedition Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
Expert Merge branch 'china/dev' into 0功能/命格 2021-12-23 09:43:06 +08:00
Explore 探索引导提交 2022-01-06 18:25:28 +08:00
FifteenDayGift
Fight 【关卡】功能引导时关闭小手显示 2022-01-17 11:02:33 +08:00
FightLevel [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
FindFairy
FindTreasure [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
FirstRecharge 【跳转】提交 2022-01-15 18:29:18 +08:00
FormFightMatch
Formation [飞升]======卡牌飞升预设修改 2022-01-17 16:53:26 +08:00
FuXingGaoZhao
Gem 【命格】红点显示不正确 2022-01-10 15:48:38 +08:00
GeneralPanel Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
GlobalActTimeCtrl Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
GodSoul [飞升]============飞升修改提交 2022-01-15 12:26:12 +08:00
GoodFriend 【家园】摘星阁装备属性加持+战斗力 2021-12-31 13:44:11 +08:00
Guide 探索引导提交 2022-01-06 18:25:28 +08:00
Guild 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
HandBook Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
Harmony Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
Hero Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
HomeLand 【家园】特权按钮修改 2022-01-14 17:44:54 +08:00
Incarnation 【方寸寻宝】点击自选箱显示详细信息 2022-01-12 15:38:31 +08:00
JourneyWithWind
JumpServer 【跨服战】尝试修复打开跨服战报错 2022-01-15 07:36:48 +08:00
Likability 【动画】神将切换动画优化 2021-12-31 01:45:13 +08:00
LingMaiMiJing 【灵脉秘境】1号灵脉的灵气数值超框 2021-12-02 19:49:49 +08:00
Login Merge branch 'china/dev' into 0功能/家园 2022-01-06 16:40:24 +08:00
LuckyCat
LuckyTurnTable
Mail 【邮件】有附件时添加分割线 2022-01-02 02:48:03 +08:00
Main 【限时升星】添加可选择的升星有礼活动 2022-01-08 18:40:04 +08:00
Map Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
MapFight
Message 探索提交 2021-12-23 13:09:34 +08:00
Mission
MonsterCamp Merge branch 'china/dev' into 0功能/家园 2022-01-06 15:38:48 +08:00
Net Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
NewActivity Merge branch '0活动/新大圣升星' into china/dev 2022-01-14 14:00:20 +08:00
NiuQiChongTian 【牛气冲天】页签根据数据判断显隐 2021-12-08 15:56:08 +08:00
NiuZhuanQianKun
OnlineReward
Operating 【跳转】提交 2022-01-15 18:29:18 +08:00
Pay
Player 【名望礼包】红点 2022-01-17 14:10:08 +08:00
Pokemon
Popup Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
Power
Practice 【修行】优化修行突破后显示 2022-01-14 13:51:13 +08:00
Pray 招募秘宝提交 2021-12-10 13:41:03 +08:00
QiJieShiLian [飞升]=======飞升代码逻辑提交 2022-01-05 18:17:44 +08:00
Questionnaire
QuickPurchase
Ranking
Recharge 【名望礼包】提交 2022-01-17 13:16:18 +08:00
Recruit [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +08:00
RedPoint
Resolve 【飞升】===========神魂后星级显示修改 2022-01-10 15:11:30 +08:00
RewardBox 变身卡自选箱修改 2021-12-06 15:45:11 +08:00
RoleInfo Merge branch 'china/dev' into china/飞升 2022-01-18 09:53:04 +08:00
SacredTree 【建木神树】满级取消箭头 2022-01-08 14:22:30 +08:00
SecretBox
Setting 【坐骑】不显示修改 2022-01-05 11:00:59 +08:00
SevenDayCarnival
Shop 商店报错添加容错 2021-12-24 11:05:39 +08:00
SoulPrint
SoulPrintAstrology
Story 【剧情】战斗剧情结束回调事件 2021-12-13 15:27:45 +08:00
SurpriseBox
TaSuiLingXiao
TailsManSoul 法宝聚灵添加白金 2022-01-13 16:41:23 +08:00
Task
TeHuiShenZhuang
TianShuMiJuan
TimeLimitSkin
TreasureOfHeaven 文字修改 2021-12-13 17:44:14 +08:00
TreasureOfSomebody
TreasureStore
UIComponent
UpGradePackage
UpStar 【限时升星】添加锁定提示 2022-01-10 14:30:45 +08:00
Update
Vip 【名望礼包】红点 2022-01-17 14:10:08 +08:00
WarPowerChange
WorkShop
WorldArena Merge branch 'china/dev' into china/飞升 2022-01-15 12:47:22 +08:00
XiaoYao 【关卡新条件】完善 2021-12-13 15:27:17 +08:00
XunBaoMiZong 【连购好礼】活动时间兼容调整 2021-12-07 15:22:52 +08:00
YuJianXing 【连购礼包】提交 2021-12-03 13:21:15 +08:00
linglongbaojing 【玲珑宝镜】玲珑商市跟随是否活动开启显示按钮 2021-12-23 17:19:27 +08:00
Achievement.meta
ActivityGift.meta
Adventure.meta
Alien.meta
Arena.meta
ArenaTopMatch.meta
Bag.meta
Battle.meta
BindPhone.meta
Carbon.meta
Chat.meta
Common.meta
Compound.meta
CompoundHero.meta
ContinuePackage.meta 【连购礼包】提交 2021-12-02 14:03:38 +08:00
DailyRecharge.meta
DataCenterService.meta
DemonSlayer.meta
DiffMonster.meta
DynamicActivity.meta
EightDay.meta
EliteMonster.meta
Equip.meta
Expedition.meta
Expert.meta
Explore.meta 探索提交 2021-12-22 12:07:00 +08:00
FifteenDayGift.meta
Fight.meta
FightLevel.meta
FindFairy.meta
FindTreasure.meta
FirstRecharge.meta
FormFightMatch.meta
Formation.meta
FuXingGaoZhao.meta
Gem.meta 【命格】提交 2021-12-06 15:07:34 +08:00
GeneralPanel.meta
GlobalActTimeCtrl.meta
GodSoul.meta
GoodFriend.meta
Guide.meta
Guild.meta
HandBook.meta
Harmony.meta
Hero.meta
HomeLand.meta 【家园】开坑 2021-12-20 16:50:51 +08:00
Incarnation.meta
JourneyWithWind.meta
JumpServer.meta
Likability.meta
LingMaiMiJing.meta
Login.meta
LuckyCat.meta
LuckyTurnTable.meta
Mail.meta
Main.meta
Map.meta
MapFight.meta
Message.meta
Mission.meta
MonsterCamp.meta
Net.meta
NewActivity.meta
NiuQiChongTian.meta
NiuZhuanQianKun.meta
OnlineReward.meta
Operating.meta
Pay.meta
Player.meta
Pokemon.meta
Popup.meta
Power.meta
Practice.meta
Pray.meta
QiJieShiLian.meta
Questionnaire.meta
QuickPurchase.meta
Ranking.meta
Recharge.meta
Recruit.meta
RedPoint.meta
Resolve.meta
RewardBox.meta
RoleInfo.meta
SacredTree.meta
SecretBox.meta
Setting.meta
SevenDayCarnival.meta
Shop.meta
SoulPrint.meta
SoulPrintAstrology.meta
Story.meta
SurpriseBox.meta
TaSuiLingXiao.meta
TailsManSoul.meta
Task.meta
TeHuiShenZhuang.meta
TianShuMiJuan.meta
TimeLimitSkin.meta
TreasureOfHeaven.meta
TreasureOfSomebody.meta
TreasureStore.meta
UIComponent.meta
UpGradePackage.meta
UpStar.meta
Update.meta
Vip.meta
WarPowerChange.meta
WorkShop.meta
WorldArena.meta
XiaoYao.meta
XunBaoMiZong.meta
YuJianXing.meta
linglongbaojing.meta