diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index 1cb4e4658b..e10c81e0ea 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -273,13 +273,13 @@ MonoBehaviour: settingInfo: logLevel: 0 isDebug: 0 - bundleMode: 1 - luaBundleMode: 1 - isUpdate: 1 - isSDK: 1 - isSDKLogin: 1 - isGuide: 1 - isOpenGM: 0 + bundleMode: 0 + luaBundleMode: 0 + isUpdate: 0 + isSDK: 0 + isSDKLogin: 0 + isGuide: 0 + isOpenGM: 1 --- !u!4 &57277738265262265 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Atlas/UpStarAtlas.meta b/Assets/ManagedResources/Atlas/UpStarAtlas.meta deleted file mode 100644 index 8b6758ff0c..0000000000 --- a/Assets/ManagedResources/Atlas/UpStarAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fd52b845f4615b2418f482acbcb2d5c6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta b/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta deleted file mode 100644 index 445dee4d36..0000000000 --- a/Assets/ManagedResources/EffectResSkill/Effect_normal_yuhuangdadi/Texture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4b9c36692b051dd4e9502147e4ee914e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta deleted file mode 100644 index 85c619cb77..0000000000 --- a/Assets/ManagedResources/Effects/Model/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70e7feb15403e214f801e51b8b4e0461 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat b/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat index 98e54cb954..5e1e78070e 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/UI_AlphaMask 1.mat @@ -74,7 +74,7 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _IsMask: 1 + - _IsMask: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta deleted file mode 100644 index 25ee432029..0000000000 --- a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ffaae1db0483704eae97ecc794d5e28 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index fff1c6428e..a0afcc31e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,7 +141,7 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - --LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value.." startTime:"..v.startTime) for n, m in ipairs(v.mission) do --LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 9e6425cf41..bfdfdf5f92 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -115,7 +115,7 @@ end function this.GetTimeStartToEnd() local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) if info then - -- --LogGreen("info.startTime:"..info.startTime.." info.endTime:"..info.endTime) + LogGreen("info.startTime:"..info.startTime.." info.endTime:"..info.endTime) local startTime= this.GetTimeShow(info.startTime) local endtime= this.GetTimeShow(info.endTime) return startTime,endtime,info.endTime diff --git a/Assets/ManagedResources/~Lua/Modules/UpStarPre.meta b/Assets/ManagedResources/~Lua/Modules/UpStarPre.meta deleted file mode 100644 index ff53765e17..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/UpStarPre.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9f6680e5797aa3a4da004c60b970a6d3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/linglongbaojing.meta b/Assets/ManagedResources/~Lua/linglongbaojing.meta deleted file mode 100644 index 06c4e01dd6..0000000000 --- a/Assets/ManagedResources/~Lua/linglongbaojing.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84e5263cf14c3fd42b34d74cee22462e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 55b6d79cd0..7ac9d11be9 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,26 +13,26 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - ActivityDropReward.xlsx - AchievementConfig.xlsx - AccomplishmentConfig.xlsx - - ComposeActivity.xlsx - - ChapterOptionConfig.xlsx - - ElementalResonanceConfig.xlsx - - EndlessMorale.xlsx + - ActivityDropReward.xlsx + - DifferDemonsBoxSeaons.xlsx + - DialogueViewConfig.xlsx + - EquipSign.xlsx - EquipSignSetting.xlsx + - EquipPropertyPool.xlsx - EquipStarsConfig.xlsx - EquipSuiteConfig.xlsx - EquipTalismanaLottery.xlsx - EquipTalismanaRankup.xlsx - - EquipTalismana.xlsx - - ErrorCodeEerverConfig.xlsx - ErrorCodeHint.xlsx - - ExchangeActivityConfig.xlsx + - ErrorCodeEerverConfig.xlsx + - EquipTalismana.xlsx - ExchangeRate.xlsx - ExpeditionFloorConfig.xlsx - - ExpeditionHolyConfig.xlsx + - ExchangeActivityConfig.xlsx - ExpeditionNodeConfig.xlsx + - ExpeditionHolyConfig.xlsx - ExpeditionRecruitConfig.xlsx - ExpeditionSetting.xlsx - ExploreFunctionConfig.xlsx @@ -41,21 +41,20 @@ MonoBehaviour: - FloodConfig.xlsx - FoodsConfig.xlsx - FreeTravel.xlsx - - FreeTravelStore.xlsx - GameSetting.xlsx - - ChapterEventPointConfig.xlsx + - FreeTravelStore.xlsx - GlobalActivity.xlsx - - GodSacrificeConfig.xlsx - GlobalSystemConfig.xlsx + - GodSacrificeConfig.xlsx - GodSacrificeSetting.xlsx - GoodLuck.xlsx - - GuildBossConfig.xlsx - GuideConfig.xlsx + - GuildBossConfig.xlsx - GuildBossRewardConfig.xlsx - GuildCheckpointConfig.xlsx - GuildHelpConfig.xlsx - - GuildLevelConfig.xlsx - GuildCheckpointRank.xlsx + - GuildLevelConfig.xlsx - GuildRedPackConfig.xlsx - GuildRewardConfig.xlsx - GuildSacrificeConfig.xlsx @@ -64,127 +63,125 @@ MonoBehaviour: - GuildSetting.xlsx - GuildWarConfig.xlsx - GuildWarRewardConfig.xlsx - - HardStageBuff.xlsx - GuildTechnology.xlsx + - HardStageBuff.xlsx - HardStageChapter.xlsx - HardStageCondition.xlsx - HardStageReward.xlsx - - HeroConfig.xlsx + - AdventureConfig.xlsx - HardStage.xlsx + - HeroConfig.xlsx - HeroLevelConfig.xlsx - HeroRankupConfig.xlsx - HeroRankupGroup.xlsx - - HeroSacrifice.xlsx - HeroReturn.xlsx - - Hongmeng.xlsx + - HeroSacrifice.xlsx - HeroSkin.xlsx + - Hongmeng.xlsx - HongmengUp.xlsx - JewelConfig.xlsx - JewelResonanceConfig.xlsx - - JourneyWithWind.xlsx - JewelRankupConfig.xlsx - - ItemConfig.xlsx + - JourneyWithWind.xlsx - JumpConfig.xlsx - - LevelSetting.xlsx - - LingLongPool.xlsx - - LoginPosterConfig.xlsx - EventPointConfig.xlsx - - LotteryRewardConfig.xlsx + - LevelSetting.xlsx + - AdventureReward.xlsx + - LoginPosterConfig.xlsx + - ActivityRankingReward.xlsx - LotterySetting.xlsx - LotterySpecialConfig.xlsx - LuckyCatConfig.xlsx - - ActivityRewardConfig.xlsx - - AdventureReward.xlsx - - MainLevelSettingConfig.xlsx - - AreaConfig.xlsx + - LuxuryFund.xlsx + - LotteryRewardConfig.xlsx - Language.xlsx + - MainLevelBoss.xlsx + - MainLevelSettingConfig.xlsx - MainLevelConfig.xlsx - MazeTreasure.xlsx - MazeTreasureSetting.xlsx - MissionEventsConfig.xlsx - MainMapIconConfig.xlsx - - ArenaBattleReward.xlsx - - ActivityRankingReward.xlsx + - MapPointConfig.xlsx - MonsterViewConfig.xlsx - MonthcardConfig.xlsx + - MonsterGroup.xlsx - MServerArenaMatchConfig.xlsx - MServerArenaReward.xlsx - MServerArenaSetting.xlsx - NewHeroConfig.xlsx - - ArenaReward.xlsx - - MonsterGroup.xlsx + - OptionAddCondition.xlsx - PackageConfig.xlsx - OptionConfig.xlsx - - PackPush.xlsx - - PassiveSkillConfig.xlsx + - AreaConfig.xlsx + - ArenaBattleReward.xlsx - PlayerAppearance.xlsx - - PassiveSkillLogicConfig.xlsx - PlayerHeadIcon.xlsx + - PassiveSkillConfig.xlsx - PlayerLevelConfig.xlsx + - PassiveSkillLogicConfig.xlsx - PlayerMountLevelUp.xlsx - PlayerRole.xlsx - PrivilegeTypeConfig.xlsx - PropertyConfig.xlsx - - QAConfig.xlsx - RaceTowerConfig.xlsx - RaceTowerRewardConfig.xlsx - RandomName.xlsx - RecommendTeam.xlsx - RechargeCommodityConfig.xlsx - - RewardGroup.xlsx + - ArenaReward.xlsx - ArenaRobotConfig.xlsx - - RewardItemConfig.xlsx - - RoleConfig.xlsx - RobotSkill.xlsx + - RoleConfig.xlsx + - RobotProperty.xlsx - RunesConfig.xlsx - RunesPoolConfig.xlsx - SevenDaysActivity.xlsx - - RobotProperty.xlsx - SevenDaysScore.xlsx - SeverConfig.xlsx - SignInConfig.xlsx + - SkillConfig.xlsx - SpecialConfig.xlsx + - SkillLogicConfig.xlsx + - RewardGroup.xlsx - SpiritAnimal.xlsx - SpiritAnimalBook.xlsx - - ArenaRobotSetting.xlsx - - SpiritAnimalSetting.xlsx - - SpiritAnimalLevel.xlsx - - SkillConfig.xlsx - - SpiritAnimalStar.xlsx - SpiritAnimalSkill.xlsx + - SpiritAnimalLevel.xlsx + - ArenaRobotSetting.xlsx + - SpiritAnimalStar.xlsx - SpiritAnimalSummon.xlsx - StoryMapConfig.xlsx - StoreTypeConfig.xlsx - SurpriseBox.xlsx - SystemMessageConfig.xlsx - - TestWelfare.xlsx - TaskConfig.xlsx + - TestWelfare.xlsx + - AudioConfig.xlsx + - BeginnerTask.xlsx + - BlessingConfig.xlsx + - BeStronger.xlsx - ThemeActivityTaskConfig.xlsx - TipsConfig.xlsx - - OptionAddCondition.xlsx - TreasureSunlongConfig.xlsx - TreasureSunlongTaskConfig.xlsx - TreasureTaskConfig.xlsx - - SkillLogicConfig.xlsx - - ArroGantFly.xlsx - - ArenaSetting.xlsx - - AdventureConfig.xlsx - - TrialGameConfig.xlsx - StoreConfig.xlsx - TrialConfig.xlsx + - TrialGameConfig.xlsx - TrialQuestionConfig.xlsx - - TrialKillConfig.xlsx - - VipLevelConfig.xlsx - - UIConfig.xlsx - TrialSetting.xlsx - - WishActivitySetting.xlsx - - WishActivityPool.xlsx - - WishActivityUp.xlsx + - TrialKillConfig.xlsx + - UIConfig.xlsx + - VipLevelConfig.xlsx - TrialwelfareConfig.xlsx + - WishActivityPool.xlsx + - WishActivitySetting.xlsx + - WishActivityUp.xlsx - WorkShopEquipmentConfig.xlsx - WorkShopFoundationConfig.xlsx - - WorkShopRebuildConfig.xlsx - WorkShopFunctionConfig.xlsx + - WorkShopRebuildConfig.xlsx - WorkShopTechnologySetting.xlsx - WorkShopSetting.xlsx - WorldBossConfig.xlsx @@ -193,78 +190,81 @@ MonoBehaviour: - WorldBossTreasureConfig.xlsx - XiuXian.xlsx - XiuXianSkill.xlsx - - BeStronger.xlsx - - AudioConfig.xlsx - - BeginnerTask.xlsx - - BlessingConfig.xlsx - - BlessingRewardPool.xlsx + - ArenaSetting.xlsx - BlessingConfigNew.xlsx - WorkShopTechnology.xlsx - BlessingRewardPoolNew.xlsx + - BloodyBattleSetting.xlsx - BloodyBattleReward.xlsx - BloodyBattleTask.xlsx - - BloodyBattleSetting.xlsx - - BloodyBattleTreasure.xlsx + - BlessingRewardPool.xlsx - BloodyMessagesConfig.xlsx - - BloodyRankConfig.xlsx - - ChallengeConfig.xlsx - BuffEffectConfig.xlsx + - BloodyRankConfig.xlsx + - BloodyBattleTreasure.xlsx + - ChallengeConfig.xlsx - ChallengeMapConfig.xlsx - ChallengeMissionConfig.xlsx - ChallengeSetting.xlsx - ChallengeStarBox.xlsx - ChampionshipReward.xlsx - ChampionshipSetting.xlsx - - ComposeBook.xlsx - - CombatControl.xlsx - - CustomEventConfig.xlsx + - ComposeActivity.xlsx - DailyTasksConfig.xlsx - - DailyChallengeConfig.xlsx - - ArtResourcesConfig.xlsx - DialRewardConfig.xlsx - - DialogueViewConfig.xlsx + - DailyChallengeConfig.xlsx + - CombatControl.xlsx + - ComposeBook.xlsx + - CustomEventConfig.xlsx + - ChapterOptionConfig.xlsx - DialRewardSetting.xlsx - - DifferDemonsBoxSetting.xlsx - - EndlessDifficulty.xlsx - DifferDemonsBoxPools.xlsx - - DifferDemonsStageConfig.xlsx - - DifferDemonsBoxSeaons.xlsx + - DifferDemonsBoxSetting.xlsx + - DifferDemonsComonpentsConfig.xlsx - DifferDemonsConfig.xlsx + - ChapterEventPointConfig.xlsx - EndlessHeroProp.xlsx - EndlessMapConfig.xlsx - - EndlessTask.xlsx + - EndlessDifficulty.xlsx + - EndlessMorale.xlsx + - DifferDemonsStageConfig.xlsx + - ElementalResonanceConfig.xlsx - EndlessTreasure.xlsx - EquipConfig.xlsx - - DifferDemonsComonpentsConfig.xlsx - - LuxuryFund.xlsx - - EquipSign.xlsx - - EquipPropertyPool.xlsx + - EndlessTask.xlsx - LevelDifficultyConfig.xlsx - - MainLevelBoss.xlsx - - MapPointConfig.xlsx + - SpiritAnimalSetting.xlsx + - PackPush.xlsx + - LingLongPool.xlsx - MonsterConfig.xlsx + - ArroGantFly.xlsx + - QAConfig.xlsx - ActivityGroups.xlsx + - RewardItemConfig.xlsx + - ArtResourcesConfig.xlsx + - ItemConfig.xlsx + - ActivityRewardConfig.xlsx _values: - - 3591751192 - 3241344334 - 427098595 - - 3430281939 - - 2893265666 - - 583891024 - - 2131729866 + - 3591751192 + - 249002466 + - 2125202605 + - 1790592577 - 3517900411 + - 3153107712 - 494399256 - 733649879 - 2568046174 - 2294226303 - - 3819745262 - - 3665019899 - 1435072166 - - 3182782072 + - 3665019899 + - 3819745262 - 1383752772 - 4026160938 - - 2417257830 + - 3182782072 - 3425624132 + - 2417257830 - 3186903494 - 664010546 - 1345627381 @@ -273,150 +273,147 @@ MonoBehaviour: - 383646065 - 2524268684 - 883391866 - - 2044535010 - 3918928620 - - 4160037602 - - 2764530185 - - 2576521861 + - 2044535010 + - 3004776761 - 263331155 + - 2576521861 - 3254997270 - 838236963 + - 254757961 - 173728414 - - 3939929504 - 3943131728 - 638518168 - 3894020600 - - 3153364400 - 2801645030 + - 3153364400 - 3195608616 - 1442255327 - 1996735664 - 1468913191 - 3079207713 - - 164852538 + - 4164546002 - 3249316745 - 2445182985 - - 1956371662 - 3259412568 + - 1956371662 - 3832630792 - 472453761 - 1287457882 - - 1965876256 + - 1848421159 - 1737333149 + - 4108347728 - 2088609989 - 3729231061 - 2276520862 - - 306567717 - 776412998 - - 562911120 + - 306567717 - 3392038628 + - 562911120 - 3314253473 - 727009153 - 3597116301 - - 1447068339 - 3242843522 - - 3648573040 + - 1447068339 - 2916647300 - - 3705022903 - - 1145999697 - - 1022500439 - 1819752851 - - 630450721 + - 3705022903 + - 613479935 + - 1022500439 + - 4005646500 - 1568267233 - 1510287699 - 2479323017 - - 3787654228 - - 613479935 - - 1691288654 - - 413963702 + - 2102746220 + - 630450721 - 144545828 + - 2028967550 + - 1691288654 - 761497169 - 2211830179 - 2227533092 - 3625815197 - 260126611 - - 1262639923 - - 4005646500 + - 3506996131 - 515856748 - 668898046 + - 1643040035 - 4126956820 - 3341190114 - 2124969915 - 4040681563 - - 2296996310 - - 1643040035 - - 3733081355 + - 48773521 + - 2821618550 - 1850897670 - - 2600757193 - - 831767647 + - 413963702 + - 1262639923 - 568109215 - - 2827798101 - 1996809505 + - 831767647 - 875247484 + - 2827798101 - 319164499 - 3623432278 - 2205349962 - 475091435 - - 3868289587 - 3888926662 - 595190689 - 38983593 - 3800802252 - 531095731 - - 1123435374 + - 2296996310 - 1516740274 - - 721575787 - - 1302883039 - 2928186292 + - 1302883039 + - 2322028500 - 1155516420 - 804383039 - 160427834 - - 2322028500 - 1952787401 - 2748321716 - 29725303 + - 4066667275 - 1485705339 + - 2202976285 + - 2248207345 - 1514382579 - 1110909246 - - 1289424307 - - 1089545938 - - 3107630705 - - 4066667275 - - 3486452697 - 1618267832 + - 3107630705 + - 1289424307 + - 3486452697 - 4241168273 - 404574725 - 1241565016 - 439383165 - 297530923 - - 4291486445 - 2921534890 + - 4291486445 + - 3751012610 + - 755222564 + - 996682802 + - 2717847060 - 551531465 - 3065130626 - - 48773521 - 1935947947 - 1328840966 - 1234843723 - - 2202976285 - - 1779346887 - - 1924824445 - - 1848421159 - - 2378733912 - 3087839702 - 266440734 + - 2378733912 - 3219303434 - - 739739032 - - 2551358611 - - 2751291362 - 141295447 - - 2197547142 - - 473929641 - - 2016739691 + - 739739032 + - 2751291362 + - 2551358611 - 2854113790 + - 473929641 + - 2197547142 + - 2016739691 - 110435588 - 98336120 - - 2777840995 - 2405621183 + - 2777840995 - 3048495520 - 3663717884 - 2555366341 @@ -425,54 +422,57 @@ MonoBehaviour: - 3127079988 - 99626147 - 1239421821 - - 2717847060 - - 3751012610 - - 755222564 - - 996682802 - - 939963957 + - 1924824445 - 2585233359 - 2453679101 - 3832584146 + - 2050621784 - 230994945 - 2131302457 - - 2050621784 - - 3507522218 + - 939963957 - 4055477448 - - 3548626589 - - 2759035733 - 3964764791 + - 3548626589 + - 3507522218 + - 2759035733 - 354392825 - 1572157444 - 1705732776 - 1565259591 - 2943614740 - 3338153430 - - 412217185 - - 1533755292 - - 2944506204 + - 3430281939 - 2847396561 - - 1774803500 - - 2773946461 - 2318315494 - - 2125202605 + - 1774803500 + - 1533755292 + - 412217185 + - 2944506204 + - 2893265666 - 4198004043 - - 932779961 - - 187904724 - 903221398 - - 1402356663 - - 249002466 + - 932779961 + - 568553271 - 460607005 + - 4160037602 - 628315322 - 2530885670 - - 2987609448 + - 187904724 + - 2131729866 + - 1402356663 + - 583891024 - 2141638640 - 1727918065 - - 568553271 - - 2102746220 - - 1790592577 - - 3153107712 + - 2987609448 - 295715991 - - 2028967550 - - 3506996131 + - 1089545938 + - 2600757193 + - 2671993191 - 1669172147 - - 3149695882 + - 1779346887 + - 568334000 + - 1174223052 + - 290384583 + - 1076133686 + - 596599215 + - 4284267939 diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs index 513a96afe6..d8ce6fb8ab 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/ImportResWindow.cs @@ -111,7 +111,13 @@ namespace GameEditor.Util ImportTexture(path); } EditorGUILayout.EndHorizontal(); - + + + if (GUILayout.Button("上传", GUILayout.ExpandWidth(false))) + { + System.Diagnostics.Process.Start("cmd.exe", "/K 一键提交到git.bat hello world"); + } + EditorGUILayout.EndVertical(); } void ImportTexture(string path) diff --git a/Assets/StreamingAssets/Android.meta b/Assets/StreamingAssets/Android.meta deleted file mode 100644 index 17546b3f06..0000000000 --- a/Assets/StreamingAssets/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 88ae94ae510d46947966f1c53d98556f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/一键提交到git.bat b/一键提交到git.bat new file mode 100644 index 0000000000..f1cf193208 --- /dev/null +++ b/一键提交到git.bat @@ -0,0 +1,22 @@ +@echo off + +:: 获取当前脚本的路径 +cd /d %~dp0 +:: 自动提交 +git init +git add . + git commit -m "bat批处理自动推送:%date:~0,10%,%time:~0,8%" +:: git commit -m "%commitMessage%" +git push origin master +@echo 已经完成, + +SET daoTime=60 +:dao +set /a daoTime=daoTime-1 +ping -n 2 -w 500 127.1>nul +cls +echo 上传Git完成 ,倒计时退出: %daoTime%秒 +if %daoTime%==0 (exit) else (goto dao) + + +