miduo_client/Assets/ManagedResources/~Lua/Modules
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
..
Achievement Merge branch 'local_to_xmadev' into xma/dev 2021-02-20 17:55:52 +08:00
ActivityGift 还原lua 2021-03-02 16:53:12 +08:00
Adventure 还原lua 2021-03-02 16:53:12 +08:00
Alien 还原lua 2021-03-02 16:53:12 +08:00
Arena 竞技守卫修改 2021-03-02 18:05:06 +08:00
ArenaTopMatch 【本地化】竞技场 积天豪礼 2021-03-03 10:07:13 +08:00
Bag 还原lua 2021-03-02 16:53:12 +08:00
Battle 还原lua 2021-03-02 16:53:12 +08:00
BindPhone 还原lua 2021-03-02 16:53:12 +08:00
Carbon 本地化 提交 2021-03-04 10:16:07 +08:00
Chat 还原lua 2021-03-02 16:53:12 +08:00
Common 还原lua 2021-03-02 16:53:12 +08:00
Compound 还原lua 2021-03-02 16:53:12 +08:00
CompoundHero 还原lua 2021-03-02 16:53:12 +08:00
DailyRecharge 还原lua 2021-03-02 16:53:12 +08:00
DataCenterService Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev 2021-03-04 13:47:59 +08:00
DemonSlayer 还原lua 2021-03-02 16:53:12 +08:00
DiffMonster 还原lua 2021-03-02 16:53:12 +08:00
DynamicActivity 还原lua 2021-03-02 16:53:12 +08:00
EightDay 还原lua 2021-03-02 16:53:12 +08:00
EliteMonster 还原lua 2021-03-02 16:53:12 +08:00
Equip 还原lua 2021-03-02 16:53:12 +08:00
Expedition 还原lua 2021-03-02 16:53:12 +08:00
Expert 还原lua 2021-03-02 16:53:12 +08:00
Fight 【本地化】 2021-03-03 18:25:34 +08:00
FindFairy 还原lua 2021-03-02 16:53:12 +08:00
FindTreasure 还原lua 2021-03-02 16:53:12 +08:00
FirstRecharge 还原lua 2021-03-02 16:53:12 +08:00
FormFightMatch 还原lua 2021-03-02 16:53:12 +08:00
Formation 还原lua 2021-03-02 16:53:12 +08:00
GeneralPanel 还原lua 2021-03-02 16:53:12 +08:00
GlobalActTimeCtrl 还原lua 2021-03-02 16:53:12 +08:00
GoodFriend 还原lua 2021-03-02 16:53:12 +08:00
Guide 还原lua 2021-03-02 16:53:12 +08:00
Guild 还原lua 2021-03-02 16:53:12 +08:00
HandBook 还原lua 2021-03-02 16:53:12 +08:00
Harmony 【本地化】鸿蒙阵修改 2021-03-04 11:05:19 +08:00
Hero 还原lua 2021-03-02 16:53:12 +08:00
Login Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev 2021-03-04 13:47:59 +08:00
LuckyCat 还原lua 2021-03-02 16:53:12 +08:00
LuckyTurnTable 还原lua 2021-03-02 16:53:12 +08:00
Mail 还原lua 2021-03-02 16:53:12 +08:00
Main 主城修改 2021-03-03 14:19:34 +08:00
Map 还原lua 2021-03-02 16:53:12 +08:00
MapFight 还原lua 2021-03-02 16:53:12 +08:00
Message 【本地化】鸿蒙阵修改 2021-03-04 11:05:19 +08:00
Mission 还原lua 2021-03-02 16:53:12 +08:00
MonsterCamp 还原lua 2021-03-02 16:53:12 +08:00
Net 还原lua 2021-03-02 16:53:12 +08:00
NiuZhuanQianKun 还原lua 2021-03-02 16:53:12 +08:00
OnlineReward 本地化 提交 2021-03-04 10:16:07 +08:00
Operating 【本地化】 2021-03-03 11:30:06 +08:00
Pay 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
Player 还原lua 2021-03-02 16:53:12 +08:00
Pokemon 灵兽界面修改提交 2021-03-02 21:06:42 +08:00
Popup Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 18:23:25 +08:00
Power 还原lua 2021-03-02 16:53:12 +08:00
Pray 还原lua 2021-03-02 16:53:12 +08:00
Questionnaire 还原lua 2021-03-02 16:53:12 +08:00
QuickPurchase 还原lua 2021-03-02 16:53:12 +08:00
Ranking 【本地化】 2021-03-03 15:36:17 +08:00
Recharge 还原lua 2021-03-02 16:53:12 +08:00
Recruit 还原lua 2021-03-02 16:53:12 +08:00
RedPoint 中文表导出提交 2020-08-25 15:46:38 +08:00
Resolve 本地化 提交 2021-03-04 10:16:07 +08:00
RewardBox 还原lua 2021-03-02 16:53:12 +08:00
RoleInfo 【神将】 2021-03-03 17:45:34 +08:00
SecretBox 还原lua 2021-03-02 16:53:12 +08:00
Setting 还原lua 2021-03-02 16:53:12 +08:00
SevenDayCarnival 图片提交 2021-03-03 17:46:08 +08:00
Shop 还原lua 2021-03-02 16:53:12 +08:00
SoulPrint 还原lua 2021-03-02 16:53:12 +08:00
SoulPrintAstrology 还原lua 2021-03-02 16:53:12 +08:00
Story 还原lua 2021-03-02 16:53:12 +08:00
Task Merge branch 'local_to_xmadev' into xma/dev 2021-02-20 17:55:52 +08:00
TreasureOfHeaven 还原lua 2021-03-02 16:53:12 +08:00
TreasureOfSomebody 还原lua 2021-03-02 16:53:12 +08:00
TreasureStore 还原lua 2021-03-02 16:53:12 +08:00
UIComponent 还原lua 2021-03-02 16:53:12 +08:00
UpGradePackage 还原lua 2021-03-02 16:53:12 +08:00
Update 中文表导出提交 2020-08-25 15:46:38 +08:00
Vip 还原lua 2021-03-02 16:53:12 +08:00
WarPowerChange 中文表导出提交 2020-08-25 15:46:38 +08:00
WorkShop 还原lua 2021-03-02 16:53:12 +08:00
XiaoYao 还原lua 2021-03-02 16:53:12 +08:00
Achievement.meta 提交 2020-05-09 13:31:21 +08:00
ActivityGift.meta 提交 2020-05-09 13:31:21 +08:00
Adventure.meta 提交 2020-05-09 13:31:21 +08:00
Alien.meta 提交 2020-05-09 13:31:21 +08:00
Arena.meta 提交 2020-05-09 13:31:21 +08:00
ArenaTopMatch.meta 提交 2020-05-09 13:31:21 +08:00
Bag.meta 提交 2020-05-09 13:31:21 +08:00
Battle.meta 提交 2020-05-09 13:31:21 +08:00
BindPhone.meta 提交 2020-05-09 13:31:21 +08:00
Carbon.meta 提交 2020-05-09 13:31:21 +08:00
Chat.meta 提交 2020-05-09 13:31:21 +08:00
Common.meta 提交 2020-05-09 13:31:21 +08:00
Compound.meta 提交 2020-05-09 13:31:21 +08:00
CompoundHero.meta 神将置换界面创建 2020-08-05 15:36:22 +08:00
DailyRecharge.meta 提交 2020-05-09 13:31:21 +08:00
DataCenterService.meta 提交 2020-05-09 13:31:21 +08:00
DemonSlayer.meta 三界除魔功能添加 2020-09-27 16:43:33 +08:00
DiffMonster.meta 提交 2020-05-09 13:31:21 +08:00
DynamicActivity.meta bug修复 2020-07-28 10:24:52 +08:00
EightDay.meta 提交 2020-05-09 13:31:21 +08:00
EliteMonster.meta 提交 2020-05-09 13:31:21 +08:00
Equip.meta 提交 2020-05-09 13:31:21 +08:00
Expedition.meta 提交 2020-05-09 13:31:21 +08:00
Expert.meta 提交 2020-05-09 13:31:21 +08:00
Fight.meta 提交 2020-05-09 13:31:21 +08:00
FindFairy.meta 提交 2020-05-09 13:31:21 +08:00
FindTreasure.meta 提交 2020-05-09 13:31:21 +08:00
FirstRecharge.meta 提交 2020-05-09 13:31:21 +08:00
FormFightMatch.meta 提交 2020-05-09 13:31:21 +08:00
Formation.meta 提交 2020-05-09 13:31:21 +08:00
GeneralPanel.meta 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
GlobalActTimeCtrl.meta 提交 2020-05-09 13:31:21 +08:00
GoodFriend.meta 提交 2020-05-09 13:31:21 +08:00
Guide.meta 提交 2020-05-09 13:31:21 +08:00
Guild.meta 提交 2020-05-09 13:31:21 +08:00
HandBook.meta 提交 2020-05-09 13:31:21 +08:00
Harmony.meta 【鸿蒙阵】 初版提交 2020-11-27 17:59:25 +08:00
Hero.meta 提交 2020-05-09 13:31:21 +08:00
Login.meta 提交 2020-05-09 13:31:21 +08:00
LuckyCat.meta 提交 2020-05-09 13:31:21 +08:00
LuckyTurnTable.meta 提交 2020-05-09 13:31:21 +08:00
Mail.meta 提交 2020-05-09 13:31:21 +08:00
Main.meta 提交 2020-05-09 13:31:21 +08:00
Map.meta 提交 2020-05-09 13:31:21 +08:00
MapFight.meta 提交 2020-05-09 13:31:21 +08:00
Message.meta 提交 2020-05-09 13:31:21 +08:00
Mission.meta 提交 2020-05-09 13:31:21 +08:00
MonsterCamp.meta 提交 2020-05-09 13:31:21 +08:00
Net.meta 提交 2020-05-09 13:31:21 +08:00
NiuZhuanQianKun.meta 【牛转乾坤】资源提交 2021-01-20 14:52:12 +08:00
OnlineReward.meta 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
Operating.meta 提交 2020-05-09 13:31:21 +08:00
Pay.meta 提交 2020-05-09 13:31:21 +08:00
Player.meta 提交 2020-05-09 13:31:21 +08:00
Pokemon.meta 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
Popup.meta 提交 2020-05-09 13:31:21 +08:00
Power.meta 提交 2020-05-09 13:31:21 +08:00
Pray.meta 提交 2020-05-09 13:31:21 +08:00
Questionnaire.meta 提交 2020-05-09 13:31:21 +08:00
QuickPurchase.meta 提交 2020-05-09 13:31:21 +08:00
Ranking.meta 提交 2020-05-09 13:31:21 +08:00
Recharge.meta 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
Recruit.meta 提交 2020-05-09 13:31:21 +08:00
RedPoint.meta 提交 2020-05-09 13:31:21 +08:00
Resolve.meta 提交 2020-05-09 13:31:21 +08:00
RewardBox.meta 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
RoleInfo.meta 提交 2020-05-09 13:31:21 +08:00
SecretBox.meta 提交 2020-05-09 13:31:21 +08:00
Setting.meta 提交 2020-05-09 13:31:21 +08:00
SevenDayCarnival.meta 提交 2020-05-09 13:31:21 +08:00
Shop.meta 提交 2020-05-09 13:31:21 +08:00
SoulPrint.meta 提交 2020-05-09 13:31:21 +08:00
SoulPrintAstrology.meta 提交 2020-05-09 13:31:21 +08:00
Story.meta 提交 2020-05-09 13:31:21 +08:00
Task.meta 提交 2020-05-09 13:31:21 +08:00
TreasureOfHeaven.meta 外网包 0.16.1 2020-05-25 19:16:23 +08:00
TreasureOfSomebody.meta 提交 2020-05-09 13:31:21 +08:00
TreasureStore.meta 提交 2020-05-09 13:31:21 +08:00
UIComponent.meta 提交 2020-05-09 13:31:21 +08:00
UpGradePackage.meta 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
Update.meta 提交 2020-05-09 13:31:21 +08:00
Vip.meta 提交 2020-05-09 13:31:21 +08:00
WarPowerChange.meta 提交 2020-05-09 13:31:21 +08:00
WorkShop.meta 提交 2020-05-09 13:31:21 +08:00
XiaoYao.meta 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00