Merge pull request #6074 from planetarium/merge/230.x.y

merge 230.*.*

.github/workflows/build.yml

@@ -5,11 +5,12 @@ on:
     branches:
       - main
       - development
+      - preview
       - release/*
       - fast-track/*
-    tags: ["*"]
+    tags: [ "*" ]
   pull_request:
-    types: [ready_for_review, opened, reopened, auto_merge_enabled]
+    types: [ ready_for_review, opened, reopened, auto_merge_enabled ]
   workflow_dispatch:
     inputs:
 
@@ -18,8 +19,8 @@ concurrency:
   cancel-in-progress: true
 
 permissions:
-    id-token: write
-    contents: read
+  id-token: write
+  contents: read
 
 env:
   UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
@@ -32,8 +33,8 @@ jobs:
     runs-on:
       group: linux-8cores
     defaults:
-        run:
-          shell: bash
+      run:
+        shell: bash
     strategy:
       fail-fast: false
       matrix:
@@ -92,7 +93,10 @@ jobs:
           if-no-files-found: error
 
   extract:
-    if: startsWith(github.ref, 'refs/heads/release/') || startsWith(github.event.ref, 'refs/tags/')
+    if: (startsWith(github.ref, 'refs/heads/release/')
+      || github.ref == 'refs/heads/preview'
+      || startsWith(github.event.ref, 'refs/tags/')
+      )
     needs: build
     runs-on: ubuntu-latest
     outputs:
@@ -104,18 +108,21 @@ jobs:
       - name: extract
         id: extract
         run: |
-          if [[ "${{ startsWith(github.ref, 'refs/heads/release/') }}" == "true" ]]; then
-              timestamp=$(date +%s)
-
-              major=${timestamp:0:4}
-              minor=${timestamp:4:3}
-              patch=${timestamp:7:3}
+          timestamp=$(date +%s)
 
-              semver="${major}.${minor}.${patch}"
+          major=${timestamp:0:4}
+          minor=${timestamp:4:3}
+          patch=${timestamp:7:3}
 
+          semver="${major}.${minor}.${patch}"
+          if [[ "${{ startsWith(github.ref, 'refs/heads/release/') }}" == "true" ]]; then
               echo "::set-output name=network::internal"
               echo "::set-output name=signing::--no-signing"
               echo "::set-output name=version::$semver"
+          elif [[ "${{ github.ref == 'refs/heads/preview' }}" == "true" ]]; then
+              echo "::set-output name=network::preview"
+              echo "::set-output name=signing::--no-signing"
+              echo "::set-output name=version::$semver"
           elif [[ "${{ startsWith(github.event.ref, 'refs/tags/') }}" == "true" ]]; then
               TAG_NAME=${GITHUB_REF#refs/tags/}
 
@@ -129,7 +136,10 @@ jobs:
           fi
 
   release:
-    if: startsWith(github.ref, 'refs/heads/release/') || startsWith(github.event.ref, 'refs/tags/')
+    if: (startsWith(github.ref, 'refs/heads/release/')
+      || github.ref == 'refs/heads/preview'
+      || startsWith(github.event.ref, 'refs/tags/')
+      )
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -176,9 +186,12 @@ jobs:
 
 
   update-latest-metadata:
-    if: startsWith(github.ref, 'refs/heads/release/') || startsWith(github.event.ref, 'refs/tags/')
+    if: (startsWith(github.ref, 'refs/heads/release/')
+      || github.ref == 'refs/heads/preview'
+      || startsWith(github.event.ref, 'refs/tags/')
+      )
     runs-on: ubuntu-20.04
-    needs: [extract, release]
+    needs: [ extract, release ]
     environment:
       name: ${{ needs.extract.outputs.network }}
     permissions:
@@ -188,10 +201,10 @@ jobs:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
-            role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_TO_ASSUME }}
-            role-session-name: GitHubActions-${{ github.run_id }}
-            role-duration-seconds: 1200
-            aws-region: ap-northeast-2
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_TO_ASSUME }}
+          role-session-name: GitHubActions-${{ github.run_id }}
+          role-duration-seconds: 1200
+          aws-region: ap-northeast-2
 
       - name: update-latest-metadata
         uses: planetarium/9c-toolbelt@main

nekoyume/Assets/AddressableAssets/Character/NPC/300009/300009.atlas.txt

@@ -2,195 +2,192 @@
 size:1024,512
 filter:Linear,Linear
 pma:true
-BG
-bounds:2,244,368,266
-offsets:0,0,368,270
+BG2
+bounds:2,214,414,296
+offsets:2,0,417,296
 acc_01
-bounds:461,186,54,82
+bounds:633,293,54,82
 acc_02
-bounds:187,146,123,32
+bounds:820,478,123,32
 acc_03
-bounds:522,385,27,109
+bounds:568,377,27,109
 rotate:90
 acc_04
-bounds:774,485,111,25
+bounds:680,388,111,25
 offsets:1,1,113,27
 arm_L
-bounds:740,404,78,57
+bounds:374,45,78,57
 offsets:1,1,82,59
 rotate:90
 arm_R_
-bounds:613,311,72,58
+bounds:557,174,72,58
 offsets:1,3,74,63
-rotate:90
 belt_01
-bounds:1001,330,15,17
+bounds:439,2,15,17
 offsets:1,1,17,19
+rotate:90
 belt_02
-bounds:312,147,31,47
+bounds:763,306,31,47
 offsets:1,1,33,49
-rotate:90
 belt_03
-bounds:433,176,10,17
+bounds:700,229,10,17
 offsets:1,1,12,19
 belt_04
-bounds:241,2,11,12
+bounds:418,125,11,12
 offsets:1,3,13,16
+rotate:90
 belt_05
-bounds:956,313,43,34
+bounds:476,98,43,34
 offsets:1,1,45,36
 belt_06
-bounds:847,286,13,16
+bounds:458,4,13,16
 offsets:1,1,15,18
 rotate:90
 body_01
-bounds:190,29,75,89
+bounds:296,123,75,89
 offsets:1,1,77,91
-rotate:90
 body_02
-bounds:78,28,76,110
+bounds:568,406,76,110
 rotate:90
 cloth_01
-bounds:281,45,29,59
+bounds:418,138,29,59
 offsets:0,0,29,60
+rotate:90
 cloth_02
-bounds:966,392,50,36
+bounds:819,440,50,36
 ear_L
-bounds:799,360,53,78
+bounds:488,234,53,78
 rotate:90
 ear_R
-bounds:881,404,61,83
-rotate:90
+bounds:418,169,61,83
 effect_light01
-bounds:78,2,24,24
+bounds:160,16,24,24
 offsets:0,0,25,25
 effect_line02
-bounds:522,484,250,26
+bounds:568,484,250,26
 eyeWR
-bounds:514,271,41,26
+bounds:919,435,41,26
+rotate:90
 eyeball_L
-bounds:345,182,20,26
+bounds:797,363,20,26
 eyeball_R
-bounds:1000,364,22,26
+bounds:793,391,22,26
+rotate:90
 eyebrow_1
-bounds:797,330,72,28
+bounds:689,325,72,28
 offsets:1,1,74,30
 eyebrow_2
-bounds:794,301,72,27
+bounds:689,296,72,27
 offsets:1,1,74,29
 eyebrow_3
-bounds:514,299,77,27
+bounds:945,483,77,27
 offsets:1,1,79,29
-rotate:90
 eyeline_L
-bounds:154,6,39,20
+bounds:557,137,39,20
 eyeline_R
-bounds:104,6,48,20
+bounds:742,246,48,20
+rotate:90
 eyewL
-bounds:345,210,32,25
+bounds:160,42,32,25
 rotate:90
 glow
-bounds:673,349,65,64
+bounds:633,227,65,64
 offsets:5,2,74,69
 hair_01
-bounds:187,180,62,156
+bounds:2,12,62,156
 rotate:90
 hair_02
-bounds:887,467,43,87
-rotate:90
+bounds:373,125,43,87
 hair_03
-bounds:372,195,73,87
-rotate:90
+bounds:488,289,73,87
 hair_04
-bounds:740,331,55,71
-hair_05
-bounds:187,106,38,86
+bounds:631,170,55,71
 rotate:90
+hair_05
+bounds:263,18,38,86
 hair_06
-bounds:481,270,31,106
-hand_L_01
-bounds:738,286,43,54
+bounds:689,355,31,106
 rotate:90
+hand_L_01
+bounds:774,428,43,54
 hand_L_02
-bounds:517,232,37,37
+bounds:476,59,37,37
 hand_L_03
-bounds:976,470,40,46
-rotate:90
+bounds:700,248,40,46
 hand_L_04
-bounds:633,385,32,27
+bounds:521,102,32,27
 hand_L_05
-bounds:956,349,42,41
+bounds:303,2,42,41
+rotate:90
 hand_L_06
-bounds:367,165,28,31
+bounds:764,273,28,31
 offsets:0,0,29,31
-rotate:90
 hand_L_07
-bounds:543,309,68,74
+bounds:481,164,68,74
 offsets:1,2,71,76
+rotate:90
 hand_L_08
-bounds:312,65,41,37
+bounds:433,59,41,37
 hand_L_09
-bounds:597,270,34,37
+bounds:985,447,34,37
+rotate:90
 hand_R_01
-bounds:318,104,42,41
+bounds:395,2,42,41
 hand_R_02
-bounds:633,278,29,31
+bounds:526,131,29,31
 hand_R_03
-bounds:976,430,38,46
+bounds:871,438,38,46
 rotate:90
 hand_R_04
-bounds:400,165,31,28
+bounds:764,243,31,28
 hand_R_05
-bounds:281,2,41,47
+bounds:346,2,41,47
 offsets:0,1,41,48
 rotate:90
 hand_R_06
-bounds:517,193,36,37
+bounds:947,444,36,37
 hand_R_07
-bounds:879,333,69,75
+bounds:303,46,69,75
 offsets:1,1,71,76
-rotate:90
 hand_R_08
-bounds:275,106,41,38
+bounds:433,98,41,38
 hand_R_09
-bounds:557,272,35,38
-rotate:90
+bounds:439,19,35,38
 head
-bounds:2,106,183,136
+bounds:2,76,183,136
 leg_L
-bounds:799,415,68,80
-rotate:90
+bounds:563,295,68,80
 leg_R
-bounds:522,414,68,122
-rotate:90
+bounds:418,254,68,122
 mouth_01
-bounds:794,286,51,13
+bounds:557,159,51,13
 offsets:1,3,52,16
 mouth_02
-bounds:312,50,44,13
+bounds:501,13,44,13
 offsets:6,4,52,18
+rotate:90
 mouth_03
-bounds:1000,349,22,13
+bounds:263,3,22,13
 offsets:10,1,33,15
 mouth_04
-bounds:241,16,38,11
+bounds:774,415,38,11
 neck
-bounds:195,4,23,44
+bounds:476,13,23,44
 offsets:1,1,25,46
-rotate:90
 shoulder_L
-bounds:673,288,63,59
+bounds:568,234,63,59
 offsets:2,1,66,61
 shoulder_R
-bounds:330,3,28,45
+bounds:479,134,28,45
 offsets:1,1,30,47
+rotate:90
 tail
-bounds:372,378,148,132
+bounds:418,378,148,132
 thigh_L
-bounds:2,2,102,74
+bounds:187,2,102,74
 rotate:90
 thight_R
-bounds:646,415,67,92
+bounds:680,415,67,92
 rotate:90
 token_20%
-bounds:372,270,107,106
+bounds:187,106,107,106