Commit Graph

157 Commits (6ea9015bed0f6521582d8d9411cbade941f72f84)

Author SHA1 Message Date
gaoxin 9b1a412eb8 【log】无用log删除 2021-05-27 16:50:49 +08:00
gaoxin 4a44d87c27 【测试】打包速度测试接口 2021-05-27 13:32:44 +08:00
gaoxin 7dede46133 【version】不再保存到resources路径 2021-05-26 13:43:49 +08:00
gaoxin 00d42ca8d9 【本地化】导出lua文本时,不再对没有变化的文件进行写操作 2021-05-19 19:47:39 +08:00
gaoxin a092534a16 【工具】图片整理工具优化 2021-05-19 16:06:43 +08:00
gaoxin 989361e574 Merge branch 'china/ios' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
2021-05-19 15:15:13 +08:00
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
jiaoyangna 83697a9de4 Merge branch 'china/dev' into china/dev-c 2021-05-18 20:53:23 +08:00
gaoxin d084904f33 【公告】修改公告通道的配置位置 2021-05-18 16:19:36 +08:00
gaoxin 1da9223506 【公告】修改公告的字段名,version工具添加公告配置 2021-05-18 15:37:37 +08:00
wangzhenxing 51392f0a62 服务器战斗逻辑同表工具修改 2021-05-17 10:21:23 +08:00
gaoxin fff810429e 【工具】战斗数据表同步工具添加 2021-04-30 14:37:01 +08:00
gaoxin 4aa65ff804 【关闭log】 2021-04-23 14:08:27 +08:00
gaoxin 057f899cad 【资源】卸载资源时判断,如果loader没有卸载时,资源不再卸载 2021-04-23 13:28:14 +08:00
gaoxin 3e3f5888d0 【白片】添加一些debug日志 2021-04-23 11:42:27 +08:00
gaoxin d9640a660c 【sploader】翻译资源加载优化 2021-04-22 17:54:03 +08:00
gaoxin 49fcaadf00 【资源】资源卸载后引用置空 2021-04-22 16:58:10 +08:00
jiaoyangna 0999af8061 资源提交 2021-04-22 15:07:18 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
JLIOSM1 56d849c6a1 【ios】添加图片回收机制,子物体不再从缓存池中创建,修改commonatlas到dy文件夹 2021-04-20 17:13:10 +08:00
JLIOSM1 4631e0cfcb 【打包】删除在打包时可以设置version内容的功能 2021-04-19 21:18:06 +08:00
JLIOSM1 0fcff7b763 【资源压缩】修改ios资源压缩格式,添加重新导入工具 2021-04-19 21:17:34 +08:00
gaoxin 5105747314 【配置】异步获取配置文件 2021-04-16 15:22:35 +08:00
gaoxin 52fb286afa 【本地化】修复第一次安装包时无法根据当前系统语言修改游戏内语言的问题 2021-04-10 19:08:57 +08:00
gaoxin 0cc7de1597 【本地化工具】添加不导出文件配置,gm界面不再导出翻译 2021-04-09 18:02:32 +08:00
gaoxin b7ddc9ae4e 【本地化工具】名称检测工具优化 2021-04-08 18:30:21 +08:00
gaoxin 1a4c96e88d Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Framework/Framework.lua
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/WeekCard.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/HeroAndEquipResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua
#	Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerSkin.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerTitle.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	data_execl/Language_data/LanguageLua.csv
#	data_execl/Language_data/LanguageText.csv
2021-04-02 11:34:27 +08:00
gaoxin 041d00baa7 【屏幕适配】宽屏适配方案修改(需要换包) 2021-03-31 12:07:06 +08:00
gaoxin 2400cbc427 【资源导入工具】资源导入时自动设置压缩格式,修复本地化资源导入工具导入资源缓存不清除的问题 2021-03-29 17:58:48 +08:00
gaoxin f3185f7fe4 【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题 2021-03-29 10:53:46 +08:00
gaoxin 2b93da57a5 【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题 2021-03-29 10:47:39 +08:00
gaoxin 63f2ab22ad 【本地化工具】优化翻译图片导入的规则,将图片像素优化工具修改为工程外生效 2021-03-26 11:44:05 +08:00
gaoxin e9968d8517 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
jiaoyangna 0b5afbc4ea Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8.
2021-03-09 14:36:27 +08:00
jiaoyangna 64062ba3cf Revert "图片提交"
This reverts commit 6418f1280d.
2021-03-09 14:36:20 +08:00
jiaoyangna 6418f1280d 图片提交 2021-03-09 14:18:15 +08:00
jiaoyangna 72998061d8 删除 有_zh的图片的 没有加后缀的 图片 2021-03-09 14:08:19 +08:00
jiaoyangna bdba95c160 添加整理资源 2021-03-09 12:03:53 +08:00
gaoxin eca086eabc 【工具】特效资源整理工具 2021-03-08 14:37:38 +08:00
gaoxin 30b1091289 【工具】刷新资源路径工具不再自动重命名 2021-03-08 14:34:02 +08:00
gaoxin 22dbfc310c 【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改 2021-03-07 20:48:05 +08:00
gaoxin 8750406dfc Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 20:19:42 +08:00
gaoxin 0c29596eb1 【配置】服务器配置还原到version.txt中 2021-03-04 20:19:26 +08:00
jiaoyangna 21e0998228 图片提交 2021-03-04 20:17:22 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
jiaoyangna f309c54436 导出代码和预设的翻译表 2021-03-04 11:04:47 +08:00
jiaoyangna d429d11d29 图片提交 2021-03-03 16:26:10 +08:00
jiaoyangna bdb47125a6 Merge branch 'local_to_dev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.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/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.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/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/ExpeditionManager.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/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.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/GuildMemberInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.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/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.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/PlayerInfoPopup.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/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.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/ItemView.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
#	FontArt/ArtFont_zh/hongmengzhen_zh.png
#	FontArt/ArtFont_zh/jianmushenshu_zh.png
#	FontArt/ArtFont_zh/silingshilian_zh.png
2021-03-02 16:44:38 +08:00
gaoxin d124d59f1b 【配置】完善逻辑并应用 2021-03-02 15:18:06 +08:00
ZhangBiao 3681714bb0 【本地化】牛转钱坤 2021-03-02 14:45:40 +08:00