图鉴优化

tower_sanguo/assets/scripts/module/general/GeneralTuJianUI.ts

@@ -64,9 +64,9 @@ export default class GeneralTuJianUI extends BaseUI {
             if (camp_type && general_data.camp != camp_type) continue;
             if (general_data.status === GENERALSTATUS.GET) {
                 owned_data.push(general_data);
-            } else if (general_data.fragment >= general_data.fragment_compose) {
+            } else if (general_data.status === GENERALSTATUS.HAVE && general_data.fragment >= general_data.fragment_compose) {
                 unlock_can_compose.push(general_data);
-            } else {
+            } else if (general_data.status === GENERALSTATUS.HAVE && general_data.fragment < general_data.fragment_compose) {
                 unlock_can_collect.push(general_data);
             }
         }

tower_sanguo/assets/scripts/module/general/general_card_info.ts

@@ -133,7 +133,7 @@ export default class general_card_info extends cc.Component {
             this.icon_camp.node.active = true;
             this.icon_camp.node.color = cc.color('#FFFFFF' as any);
             this.node_lock.active = false;
-        } else if (this.general_data.status === GENERALSTATUS.UNLOCK) {
+        } else if (this.general_data.status === GENERALSTATUS.HAVE) {
             // 已拥有 未解锁
             this.unlock_unowned.active = true;
             this.icon_camp.node.active = true;
@@ -144,7 +144,7 @@ export default class general_card_info extends cc.Component {
             this.node_lock.active = false;
             let percent = this.general_data.fragment / this.general_data.fragment_compose;
             this.spr_progressBar.fillRange = percent;
-        } else if (this.general_data.status === GENERALSTATUS.LOCK || this.general_data.status === undefined) {
+        } else if (this.general_data.status === GENERALSTATUS.UNLOCK || this.general_data.status === GENERALSTATUS.LOCK || this.general_data.status === undefined) {
             // 未拥有 未解锁
             this.node_lock.active = true;
             this.icon_camp.node.active = false;