Merge branch 'master' of http://120.92.132.192:23541/TDGame/TDGameClient3D

assets/resources/ui/SignInUI.prefab

@@ -2930,7 +2930,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -1,
       "y": 0,
       "z": 0
     },
@@ -3533,7 +3533,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -2.585,
+      "x": -0.585,
       "y": 0,
       "z": 0
     },
@@ -3561,7 +3561,7 @@
   },
   {
     "__type__": "cc.UITransformComponent",
-    "_name": "",
+    "_name": "ImgYiLingQu<UITransformComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 112
@@ -3582,7 +3582,7 @@
   },
   {
     "__type__": "cc.SpriteComponent",
-    "_name": "",
+    "_name": "ImgYiLingQu<SpriteComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 112
@@ -3618,7 +3618,7 @@
   },
   {
     "__type__": "cc.UIOpacityComponent",
-    "_name": "",
+    "_name": "ImgYiLingQu<UIOpacityComponent>",
     "_objFlags": 0,
     "node": {
       "__id__": 112
@@ -3668,8 +3668,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -47,
+      "x": -1,
+      "y": -48,
       "z": 0
     },
     "_lrot": {
@@ -12586,7 +12586,7 @@
   },
   {
     "__type__": "8f305iaLZ1Gx4ZMRDT1Tqag",
-    "_name": "",
+    "_name": "SignInUI<SignMediator>",
     "_objFlags": 0,
     "node": {
       "__id__": 1

assets/scripts/games/ui/signs/DayItemScript.ts

@@ -57,20 +57,23 @@ export class DayItemScript extends Component {
                 throw new Error("7日登录奖励配置类型错误:"+this.config.type)
         }
         
+        let ImgXuanZzhong:Node=find("ImgXuanZzhong",this.node);
         let ImgYiLingQu:Node=find("ImgYiLingQu",this.node);
         let stateLabel:Node=find("stateLabel",this.node);
         stateLabel.active=false;
+        ImgXuanZzhong.active=false;
         //可领取
         if(this.config.id<=GameModel.single.signDay){
             //未领取
             if(state==0){
                 ImgYiLingQu.active=false;
+                ImgXuanZzhong.active=true;
             }else{//已领取
                 ImgYiLingQu.active=true;
                 stateLabel.active=true;
             }
         }else{//不可领取
-            ImgYiLingQu.active=true;
+            ImgYiLingQu.active=false;
         }
     }