Skip to content

Y
Ygopro Arena Web
Commit 251ef746 authored by Tang Xinwei's avatar Tang Xinwei
Browse files
Options

Merge branch 'revert-to-2024.11.19' into 'master' 

Revert "Merge branch 'dealer_event_season2' into 'master'"

See merge request !8
parents 40ec3444 c8c5aa42
Pipeline #31258 failed with stage
    in 1 minute
    Expand all Show whitespace changes
    Inline Side-by-side
    Showing with 157 additions and 358 deletions
    package-lock.json
    View file @ 251ef746
    This diff is collapsed.
    src/components/Profile.vue
    View file @ 251ef746
    ...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
    <p class="text-muted" style="font-size:20px;">今日首胜: {{ activity.today }}/1 </p> <p class="text-muted" style="font-size:20px;">今日首胜: {{ activity.today }}/1 </p>
    <!-- <p class="text-muted" v-if="showActivity" style="font-size:20px;">{{ activity.name }}首胜: <!-- <p class="text-muted" v-if="showActivity" style="font-size:20px;">{{ activity.name }}首胜:
    {{ activity.total }}/{{ activity.max }} </p> --> {{ activity.total }}/{{ activity.max }} </p> -->
    <p class="text-muted" style="font-size:20px;"> <p class="text-muted" style="font-size:20px;">VS发牌姬:胜{{ vsDealerStats.win }}/负{{ vsDealerStats.lose }}/总{{ vsDealerStats.total }}</p>
    赌圣争霸大赛战绩:<br> <p class="text-muted" style="font-size:20px;">VS深渊代码:胜{{ vsGenesisStats.win }}/负{{ vsGenesisStats.lose }}/总{{ vsGenesisStats.total }}</p>
    击败了{{ vsDuelMonsterStats.win }}位对手 <br> 被干翻了{{ vsDuelMonsterStats.lose }}次
    </p>
    </div> </div>
    </div> </div>
    </div> </div>
    ...@@ -196,17 +194,12 @@ export default { ...@@ -196,17 +194,12 @@ export default {
    athletic_wl_ratio: 0, athletic_wl_ratio: 0,
    arena_rank: 0 arena_rank: 0
    }, },
    // vsDealerStats: { //发牌姬战绩 vsDealerStats: { //发牌姬战绩
    // win: 0, win: 0,
    // lose: 0, lose: 0,
    // total: 0 total: 0
    // }, },
    // vsGenesisStats: { //VS深渊代码战绩 vsGenesisStats: { //VS深渊代码战绩
    // win: 0,
    // lose: 0,
    // total: 0
    // },
    vsDuelMonsterStats: { //二期 卡片精灵战绩战绩
    win: 0, win: 0,
    lose: 0, lose: 0,
    total: 0 total: 0
    ...@@ -250,17 +243,13 @@ export default { ...@@ -250,17 +243,13 @@ export default {
    'username': this.user.username 'username': this.user.username
    } }
    // 获取VS发牌姬活动战绩 // 获取VS发牌姬战绩
    // this.fetchVsDealerStats().then(vsDealerStats => { this.fetchVsDealerStats().then(vsDealerStats => {
    // this.vsDealerStats = vsDealerStats; this.vsDealerStats = vsDealerStats;
    // }); });
    // this.fetchVsGenesisStats().then(vsGenesisStats => {
    // this.vsGenesisStats = vsGenesisStats;
    // });
    this.fetchVsDuelMonsterStats().then(vsDuelMonsterStats => { this.fetchVsGenesisStats().then(vsGenesisStats => {
    this.vsDuelMonsterStats = vsDuelMonsterStats; this.vsGenesisStats = vsGenesisStats;
    }); });
    API.getUserInfo(opt).then((res) => { API.getUserInfo(opt).then((res) => {
    ...@@ -274,46 +263,30 @@ export default { ...@@ -274,46 +263,30 @@ export default {
    methods: { methods: {
    // VS发牌姬成绩 // VS发牌姬成绩
    // async fetchVsDealerStats() { async fetchVsDealerStats() {
    // try { try {
    // const apiUrl = 'https://sapi.moecube.com:444/dealer/api/user'; const apiUrl = 'https://sapi.moecube.com:444/dealer/api/user';
    // const url = `${apiUrl}/${this.user.username}`; const url = `${apiUrl}/${this.user.username}`;
    // console.log('发牌姬API', url); console.log('发牌姬API', url);
    // const response = await Vue.http.get(url); const response = await Vue.http.get(url);
    // const jsonData = await response.json(); const jsonData = await response.json();
    // console.log('发牌姬response', jsonData.data); console.log('发牌姬response', jsonData.data);
    // return jsonData.data; return jsonData.data;
    // } catch (error) { } catch (error) {
    // console.error('Error fetching user stats:', error); console.error('Error fetching user stats:', error);
    // throw error; throw error;
    // } }
    // }, },
    // // VS深渊代码成绩 // VS深渊代码成绩
    // async fetchVsGenesisStats() { async fetchVsGenesisStats() {
    // try {
    // const apiUrl = 'https://sapi.moecube.com:444/dealer2/api/user';
    // const url = `${apiUrl}/${this.user.username}`;
    // console.log('深渊代码API', url);
    // const response = await Vue.http.get(url);
    // const jsonData = await response.json();
    // console.log('深渊代码response', jsonData.data);
    // return jsonData.data;
    // } catch (error) {
    // console.error('Error fetching user stats:', error);
    // throw error;
    // }
    // },
    // VS卡片精灵成绩
    async fetchVsDuelMonsterStats() {
    try { try {
    const apiUrl = 'https://sapi.moecube.com:444/dealer3/api/user'; const apiUrl = 'https://sapi.moecube.com:444/dealer2/api/user';
    const url = `${apiUrl}/${this.user.username}`; const url = `${apiUrl}/${this.user.username}`;
    console.log('世界BOSS卡片精灵API: ', url); console.log('深渊代码API', url);
    const response = await Vue.http.get(url); const response = await Vue.http.get(url);
    const jsonData = await response.json(); const jsonData = await response.json();
    console.log('世界BOSS卡片精灵response: ', jsonData.data); console.log('深渊代码response', jsonData.data);
    return jsonData.data; return jsonData.data;
    } catch (error) { } catch (error) {
    console.error('Error fetching user stats:', error); console.error('Error fetching user stats:', error);
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment