iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG

Browse Source
This commit is contained in:
NTG 2024-05-12 19:47:51 +09:00
commit 9970f7b0a9
5 changed files with 33346 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33337
BlueWater/Assets/01.Scenes/99.Combat_2D+.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/01.Scenes/99.Combat_2D+.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d03c35ac8d939034db61695fa732e996
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
BlueWater/Assets/01.Scenes/99.Combat_2D+1.unity → BlueWater/Assets/01.Scenes/Old/99.Combat_2D+1.unity
View File

0
BlueWater/Assets/01.Scenes/99.Combat_2D+1.unity.meta → BlueWater/Assets/01.Scenes/Old/99.Combat_2D+1.unity.meta
View File

4
BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json
View File

@ -4,12 +4,12 @@
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[System.Collections.Generic.List`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]",
"key": "Unity.Muse.Common.Preferences.organizations",
"value": "{\"value\":[{\"rid\":1000},{\"rid\":1001}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14568565657763\",\"org_name\":\"iwnc2020\",\"status\":\"trial-expired\"}},{\"rid\":1001,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"7971586351139\",\"org_name\":\"Ntion\",\"status\":\"not-entitled\"}}]}}"
"value": "{\"value\":[{\"rid\":1000}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14569290698329\",\"org_name\":\"qkdzhr33\",\"status\":\"not-entitled\"}}]}}"
},
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]",
"key": "Unity.Muse.Common.Preferences.organization",
"value": "{\"value\":{\"rid\":1000},\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14568565657763\",\"org_name\":\"iwnc2020\",\"status\":\"trial-expired\"}}]}}"
"value": "{\"value\":{\"rid\":1000},\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14569290698329\",\"org_name\":\"qkdzhr33\",\"status\":\"not-entitled\"}}]}}"
},
{
"type": "Unity.Muse.Common.PreferenceDataWrapper`1[[System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]",