1.3.112 1.小优化，完善文档

TippingGame · Mar 9, 2025 · 3e6ad43 · 3e6ad43
2 parents 146b689 + d979be6
commit 3e6ad43
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Changelog
 
+<<<<<<< HEAD
 ## [1.3.112] - 2025-03-09
 1.小优化，完善文档  
 
 ## [1.3.111] - 2025-03-06
 1.#32 修复ResourcesLoader中的三目运算符使用错误  
+=======
+## [1.3.111] - 2025-03-06
+1.#33 修复ResourcesLoader中的三目运算符使用错误，this.subAssetName赋值，优化代码  
+>>>>>>> d979be685c136e8ab1f0d0cf28d7a62b66ba5250
 
 ## [1.3.110] - 2025-03-06
 1.#32 的优化  

diff --git a/package.json b/package.json
@@ -2,7 +2,11 @@
   "name": "com.tippinggame.f8framework",
   "displayName": "F8Framework",
   "description": "Unity F8Framework Core",
+<<<<<<< HEAD
   "version": "1.3.112",
+=======
+  "version": "1.3.111",
+>>>>>>> d979be685c136e8ab1f0d0cf28d7a62b66ba5250
   "unity": "2021.3",
   "license": "MIT",
   "keywords": ["Unity", "Framework", "Core"],