diff --git a/Assets/package.json b/Assets/package.json index fc657f1..73d74d2 100644 --- a/Assets/package.json +++ b/Assets/package.json @@ -2,7 +2,7 @@ "name": "com.commercialization.topon", "displayName": "Commercialization.topon", "description": "基于topon的广告sdk封装,依赖基础商业化模块", - "version": "1.3.2", + "version": "1.3.5", "unity": "2021.1", "license": "MIT", "repository": { diff --git a/Update Upm.bat b/Update Upm.bat index 833171e..acd00f0 100644 --- a/Update Upm.bat +++ b/Update Upm.bat @@ -1,22 +1,37 @@ @echo off +chcp 936 color a -echo ʼύgit upm.... -echo ύupmǰȷǰ֧иĶѾύ -:setVersion -set /p var=뱾ύUpm汾 -------- -set /p Flg=ȷύİ汾%var%Ƿʼύ(y/n) -------- : +echo 开始提交到git upm.... +echo 提交upm前请确保当前分支所有改动都已经提交! + +:: 使用 findstr 从 package.json 中提取版本号 +for /f "tokens=2 delims=:, " %%i in ('findstr "version" Assets\package.json') do ( + set version=%%i +) +:: 移除引号 +set version=%version:"=% + +echo 从package.json中读取的版本号为:%version% + +:: 检查tag是否已存在 +git tag | findstr "%version%" > nul +if %errorlevel% equ 0 ( + echo 错误:版本号 %version% 对应的tag已存在! + pause + exit +) + +set /p Flg=确认提交的版本号%version%,是否开始提交(y/n) -------- : IF "%Flg%" equ "y" ( - echo ʼύرոôڣ + echo 开始提交,请勿关闭该窗口! git subtree split --prefix=Assets --branch upm - git tag %var% upm + git tag %version% upm git push origin upm --tags GOTO :END ) -GOTO :setVersion - :END -echo ִ! +echo 执行完成! pause exit \ No newline at end of file