From 0da4b5e8d866baf8638587d0d1d3be93ca87fb5b Mon Sep 17 00:00:00 2001
From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com>
Date: Mon, 27 Nov 2023 02:22:24 +0800
Subject: [PATCH] update

---
 JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts | 4 ++--
 JisolGameCocos/extensions/ngame                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
index 50cd98bc..464b7644 100644
--- a/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
+++ b/JisolGameCocos/assets/script/ui/Pet/PetUpStarView.ts
@@ -81,7 +81,7 @@ export class PetUpStarView extends JNLayerBase {
         
         let upStarExp = TD.TbGRoleUpStar.get(this.data.petStar + 1).merge;
         this.petStarExp.string = `升级进度: ${upStarExp} / ${this.data.petStarExp}`;
-        this.petExpProgress.value = (this.data.petStarExp / upStarExp);
+        this.petExpProgress.value = this.data.petStar + (this.data.petStarExp / upStarExp);
 
     }
 
@@ -124,7 +124,7 @@ export class PetUpStarView extends JNLayerBase {
         this.petStar.string = `当前星级: ${petStar} 星`;
         this.petStarExp.string = `升级进度: ${upStarExp} / ${petStarExp}`;
         //预览进度
-        this.viewPetExpProgress.value = (petStarExp / upStarExp);
+        this.viewPetExpProgress.value = petStar + (petStarExp / upStarExp);
 
     }
 
diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame
index 8c270e5f..47865f8d 160000
--- a/JisolGameCocos/extensions/ngame
+++ b/JisolGameCocos/extensions/ngame
@@ -1 +1 @@
-Subproject commit 8c270e5f8d9df4b531c5c102a43c1a66c85e2e53
+Subproject commit 47865f8d0af09462f3cf8594ccde001802df8723