From 0171d63c2119901f0fc35d8acab4c9ef18eff3d8 Mon Sep 17 00:00:00 2001
From: Foldcc_b1 <lhyuau@qq.com>
Date: Thu, 13 Mar 2025 17:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0Upm.bat=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=BB=A5=E4=BB=8Epackage.json=E4=B8=AD=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=8C=E5=B9=B6=E5=B0=86=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E6=9B=B4=E6=96=B0=E8=87=B31.3.5=EF=BC=8C?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=8F=90=E4=BA=A4=E5=89=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?tag=E6=98=AF=E5=90=A6=E5=B7=B2=E5=AD=98=E5=9C=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/package.json |  2 +-
 Update Upm.bat      | 35 +++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

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