Skip to content

Commit

Permalink
v71
Browse files Browse the repository at this point in the history
  • Loading branch information
@osamadeep
osamadeep committed Nov 8, 2022
1 parent 4e413c3 commit 30ff25c
Show file tree
Hide file tree
Showing 19 changed files with 1,024 additions and 335 deletions.
2 changes: 1 addition & 1 deletion .../Assets/AddressableAssets/UI/Module/Arena/Join/ArenaJoinSeasonInfoSessionProgressFill.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Material:
- OffsetUV_ZoomY_1: 1
- PinchUV_Size_1: 0.25
- PixelSnap: 0
- PositionUV_X_1: 1.15
- PositionUV_X_1: 0.5322417
- PositionUV_Y_1: 0
- ResizeUV_X_1: -1
- ResizeUV_X_2: 0
Expand Down
11 changes: 11 additions & 0 deletions nekoyume/Assets/AddressableAssetsData/link.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AtlasSpriteProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
</linker>
7 changes: 7 additions & 0 deletions nekoyume/Assets/AddressableAssetsData/link.xml.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 125 additions & 0 deletions nekoyume/Assets/Resources/PerformanceTestRunInfo.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
{
"TestSuite": "",
"Date": 1667921792956,
"Player": {
"Development": false,
"ScreenWidth": 0,
"ScreenHeight": 0,
"ScreenRefreshRate": 0,
"Fullscreen": false,
"Vsync": 0,
"AntiAliasing": 0,
"Batchmode": false,
"RenderThreadingMode": "MultiThreaded",
"GpuSkinning": false,
"Platform": "",
"ColorSpace": "",
"AnisotropicFiltering": "",
"BlendWeights": "",
"GraphicsApi": "",
"ScriptingBackend": "Mono2x",
"AndroidTargetSdkVersion": "AndroidApiLevelAuto",
"AndroidBuildSystem": "Gradle",
"BuildTarget": "StandaloneWindows64",
"StereoRenderingPath": "MultiPass"
},
"Hardware": {
"OperatingSystem": "",
"DeviceModel": "",
"DeviceName": "",
"ProcessorType": "",
"ProcessorCount": 0,
"GraphicsDeviceName": "",
"SystemMemorySizeMB": 0
},
"Editor": {
"Version": "2021.3.5f1",
"Branch": "2021.3/staging",
"Changeset": "40eb3a945986",
"Date": 1655190469
},
"Dependencies": [
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]"
],
"Results": []
}
7 changes: 7 additions & 0 deletions nekoyume/Assets/Resources/PerformanceTestRunInfo.json.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_PandoraSettingPopup.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2444,10 +2444,10 @@ MonoBehaviour:
m_FillRect: {fileID: 7674687939297130789}
m_HandleRect: {fileID: 5485844281425836346}
m_Direction: 0
m_MinValue: 2
m_MaxValue: 6
m_MinValue: 4
m_MaxValue: 10
m_WholeNumbers: 1
m_Value: 5
m_Value: 4
m_OnValueChanged:
m_PersistentCalls:
m_Calls:
Expand Down
1 change: 1 addition & 0 deletions nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Keys":["com.unity.services.core.version"],"Values":[{"m_Value":"1.4.0","m_IsReadOnly":true}]}
7 changes: 7 additions & 0 deletions nekoyume/Assets/StreamingAssets/UnityServicesProjectConfiguration.json.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30ff25c

Please sign in to comment.