diff --git a/Assets/package.json b/Assets/package.json index 68e8d2b..5775a1f 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.6", + "version": "1.3.7", "unity": "2021.1", "license": "MIT", "repository": { diff --git a/Update Upm.bat b/Update Upm.bat index 2f6c0c8..18af797 100644 --- a/Update Upm.bat +++ b/Update Upm.bat @@ -31,27 +31,54 @@ set /p Flg=确认提交的版本号%version%,是否开始提交(y/n) -------- IF "%Flg%" equ "y" ( echo 开始提交,请勿关闭该窗口! - :: Force switch to master first + :: Force switch to master first and ensure clean state + echo 切换到master分支并清理工作区... git checkout -f master + git reset --hard HEAD + git clean -fd - :: Delete local upm branch if exists - git branch -D upm 2>nul - - :: Create new upm branch from current Assets folder - git subtree split --prefix=Assets --branch upm - if %errorlevel% neq 0 ( - echo 错误:创建upm分支失败! + :: Verify Assets folder exists + if not exist "Assets" ( + echo 错误:Assets文件夹不存在! goto :END ) + :: Delete local upm branch if exists + echo 清理本地upm分支... + git branch -D upm 2>nul + + :: Create new upm branch from current Assets folder with verbose output + echo 正在创建upm分支... + git subtree split --prefix Assets --branch upm --verbose + if %errorlevel% neq 0 ( + echo 错误:创建upm分支失败! + echo 正在尝试修复... + + :: Try to fix common issues + git gc + git prune + + :: Second attempt + echo 第二次尝试创建upm分支... + git subtree split --prefix Assets --branch upm --verbose + if %errorlevel% neq 0 ( + echo 错误:创建upm分支失败,请确保: + echo 1. Assets文件夹存在且不为空 + echo 2. 当前分支没有未提交的更改 + echo 3. Git仓库状态正常 + goto :END + ) + ) + :: Force update local upm branch with remote changes + echo 更新远程upm分支... git fetch origin upm git checkout -f upm git reset --hard origin/upm :: Create new subtree split git checkout -f master - git subtree split --prefix=Assets --branch upm-temp + git subtree split --prefix Assets --branch upm-temp :: Apply new changes and force push git checkout -f upm @@ -88,6 +115,7 @@ IF "%Flg%" equ "y" ( :: Return to master branch git checkout -f master + echo 所有操作已完成! ) :END