From c78ae7231d62b848bd69663e2df559606895f27b Mon Sep 17 00:00:00 2001
From: Yuntao Hu <695250295@qq.com>
Date: Tue, 25 Jun 2024 15:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E7=AB=8B=E7=BB=98=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=9B=BE=E5=8A=A0=E8=BD=BD=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Gameplay/UI/SkinChangeController.cs       |  2 ++
 .../UI/UICameraAndPosterChangeController.cs   | 34 ++++++++++---------
 .../VehicleCultivate/VehicleCultivateData.cs  |  5 +++
 ProjectNLD/Packages/manifest.json             |  1 +
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SkinChangeController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SkinChangeController.cs
index c9ce914d837..7ebb887049b 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SkinChangeController.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/SkinChangeController.cs
@@ -117,7 +117,9 @@ public class SkinChangeController : UIWindow
             else
                 posterLargePics[dataCharacter.SkinID] = sprite;
 
+            //TODO 目前半身图使用好感度图片路径
             path = CommonUtils.GetCharacterPicPath((int)curCharacterInfo.ID, CommonUtils.ECharacterPicPathType.Favorable, dataCharacter.SkinID);
+            DebugUtil.Log("目前半身图暂用使用路径为：" + path + ",请待补充相关资源与更新配置表后在此处更新相关代码");
             var halfSprite = await LoadAssetAsync<Sprite>(path);
             if (!posterHalfPics.ContainsKey(dataCharacter.SkinID))
                 posterHalfPics.Add(dataCharacter.SkinID, halfSprite);
diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UICameraAndPosterChangeController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UICameraAndPosterChangeController.cs
index aff009d93c2..7a17cc5fed4 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UICameraAndPosterChangeController.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UICameraAndPosterChangeController.cs
@@ -788,23 +788,25 @@ public class UICameraAndPosterChangeController : UIWindow
 
 		//if (_curSelectSkin == index)
 		//{
-			var posterPic =
+		//TODO 鐩墠鍗婅韩鍥句娇鐢ㄥソ鎰熷害鍥剧墖璺緞
+		var posterPic =
 				CommonUtils.GetCharacterPicPath((int)_charIDList[_curSelect], CommonUtils.ECharacterPicPathType.Favorable, index + 1);
-			var imgSkin = CommonUtils.GetComponent<Image>(go, "ButtonChange/ImageSkin");
-			var imgSelect = CommonUtils.GetGameObject(go, "ButtonChange/ImageChooseRect");
-			var imgDoSelect = CommonUtils.GetGameObject(go, "ButtonChange/ImageCover");
-			var btnChange = CommonUtils.GetComponent<Button>(go, "ButtonChange");
-			var btnNotSelect = CommonUtils.GetComponent<Button>(go, "ButtonNotSelect");
-		
-			imgSkin.sprite = await LoadAssetAsync<Sprite>(posterPic);
-		
-			btnChange.gameObject.SetActive(true);
-			btnNotSelect.gameObject.SetActive(false);
-			imgSelect.SetActive(_curSelectSkin == index);
-			imgDoSelect.SetActive(_curSelectSkin != index);
-			ClearBind(btnChange);
-			ClearBind(btnNotSelect);
-			BindButton(btnChange, _OnClickSkinItem, index);
+		var imgSkin = CommonUtils.GetComponent<Image>(go, "ButtonChange/ImageSkin");
+		var imgSelect = CommonUtils.GetGameObject(go, "ButtonChange/ImageChooseRect");
+		var imgDoSelect = CommonUtils.GetGameObject(go, "ButtonChange/ImageCover");
+		var btnChange = CommonUtils.GetComponent<Button>(go, "ButtonChange");
+		var btnNotSelect = CommonUtils.GetComponent<Button>(go, "ButtonNotSelect");
+
+        DebugUtil.Log("鐩墠鍗婅韩鍥炬殏鐢ㄤ娇鐢ㄨ矾寰勪负锛�" + posterPic + ",璇峰緟琛ュ厖鐩稿叧璧勬簮涓庢洿鏂伴厤缃〃鍚庡湪姝ゅ鏇存柊鐩稿叧浠ｇ爜");
+        imgSkin.sprite = await LoadAssetAsync<Sprite>(posterPic);
+
+		btnChange.gameObject.SetActive(true);
+		btnNotSelect.gameObject.SetActive(false);
+		imgSelect.SetActive(_curSelectSkin == index);
+		imgDoSelect.SetActive(_curSelectSkin != index);
+		ClearBind(btnChange);
+		ClearBind(btnNotSelect);
+		BindButton(btnChange, _OnClickSkinItem, index);
 
 		btnChange.GetComponent<RectTransform>().sizeDelta = SkinScrollView.GetItemSizeFromList(index);
 		//}
diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/VehicleCultivate/VehicleCultivateData.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/VehicleCultivate/VehicleCultivateData.cs
index bc572ae6c6e..b3e9fecb71b 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/VehicleCultivate/VehicleCultivateData.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/VehicleCultivate/VehicleCultivateData.cs
@@ -158,6 +158,11 @@ public class VehicleCultivateData : Gameplay.Net.VehicleInfo
 
 
     }
+    /// <summary>
+    /// 閫夊畾鍗囩骇绫诲瀷寮哄寲鑷虫弧绾у鍔犵殑鎬绘暟鍊�
+    /// </summary>
+    /// <param name="viType">鍗囩骇绫诲瀷</param>
+    /// <returns></returns>
     public float MaxUpgrades(VihecleUpgradeType viType)
     {
         DataVehicleUpgrade dataVehicleUpgrade = VehicleUpgradeTableHelper.Get(Cfg.ID, viType);
diff --git a/ProjectNLD/Packages/manifest.json b/ProjectNLD/Packages/manifest.json
index 142cc7838de..f2cba41e5df 100644
--- a/ProjectNLD/Packages/manifest.json
+++ b/ProjectNLD/Packages/manifest.json
@@ -16,6 +16,7 @@
     "com.unity.mathematics": "1.2.6",
     "com.unity.memoryprofiler": "1.1.0",
     "com.unity.mobile.android-logcat": "1.3.2",
+    "com.unity.mobile.notifications": "2.3.2",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.profiling.core": "1.0.2",
     "com.unity.purchasing": "http://1.14.122.170:3000/liutao/lib_unity_purchase.git",