final
This commit is contained in:
parent
99eaf514fd
commit
121a1b7c73
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -56,5 +56,5 @@
|
|||
"temp/": true,
|
||||
"Temp/": true
|
||||
},
|
||||
"dotnet.defaultSolution": "Archive.sln"
|
||||
"dotnet.defaultSolution": "2DMMOMirror.sln"
|
||||
}
|
||||
6
.vsconfig
Normal file
6
.vsconfig
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"version": "1.0",
|
||||
"components": [
|
||||
"Microsoft.VisualStudio.Workload.ManagedGame"
|
||||
]
|
||||
}
|
||||
BIN
Assets/.DS_Store
vendored
BIN
Assets/.DS_Store
vendored
Binary file not shown.
BIN
Assets/2D Hand Painted Tilesets/.DS_Store
vendored
BIN
Assets/2D Hand Painted Tilesets/.DS_Store
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/500ArmorIcons/.DS_Store
vendored
BIN
Assets/500ArmorIcons/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Firebase/.DS_Store
vendored
BIN
Assets/Firebase/.DS_Store
vendored
Binary file not shown.
BIN
Assets/GFX/.DS_Store
vendored
BIN
Assets/GFX/.DS_Store
vendored
Binary file not shown.
BIN
Assets/GooglePlayGames/.DS_Store
vendored
BIN
Assets/GooglePlayGames/.DS_Store
vendored
Binary file not shown.
BIN
Assets/HeroEditor4D/.DS_Store
vendored
BIN
Assets/HeroEditor4D/.DS_Store
vendored
Binary file not shown.
BIN
Assets/HeroEditor4D/FantasyHeroes/.DS_Store
vendored
BIN
Assets/HeroEditor4D/FantasyHeroes/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Lana Studio/.DS_Store
vendored
BIN
Assets/Lana Studio/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Mirror/.DS_Store
vendored
BIN
Assets/Mirror/.DS_Store
vendored
Binary file not shown.
BIN
Assets/MultiplayerPrefab/.DS_Store
vendored
BIN
Assets/MultiplayerPrefab/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Plugins/.DS_Store
vendored
BIN
Assets/Plugins/.DS_Store
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Assets/Resources/.DS_Store
vendored
BIN
Assets/Resources/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Resources/Inventory/.DS_Store
vendored
BIN
Assets/Resources/Inventory/.DS_Store
vendored
Binary file not shown.
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: BluePotion
|
||||
m_EditorClassIdentifier:
|
||||
type: blue_potion
|
||||
isUsable: 1
|
||||
image: {fileID: 21300000, guid: 5b99225932a6c1c4589ee65d3c781ca3, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: 6087918ac9a4e4724ad89f8f5585e014, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: Iron
|
||||
m_EditorClassIdentifier:
|
||||
type: Iron
|
||||
isUsable: 0
|
||||
image: {fileID: 21300000, guid: f4d66d4097065de4c89bf11be02f54cc, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: 14d875812208345ac83f274411740bde, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: Stone
|
||||
m_EditorClassIdentifier:
|
||||
type: Stone
|
||||
isUsable: 0
|
||||
image: {fileID: 21300000, guid: e9825a1ad31836845b84639a6f1a3bf7, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: fd5ff95e2be2d4f478a0ff486bb6221e, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: Wood
|
||||
m_EditorClassIdentifier:
|
||||
type: Wood
|
||||
isUsable: 0
|
||||
image: {fileID: 21300000, guid: adc82b16d783fc540b5b003a40cb3c43, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: b9a55354428144f089e4a0ea26ec457e, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ MonoBehaviour:
|
|||
m_Name: apple
|
||||
m_EditorClassIdentifier:
|
||||
type: apple
|
||||
isUsable: 1
|
||||
image: {fileID: 21300000, guid: 0ca683d694afea64b85a7bb9d0e07a96, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: e03629168e8d04fc59c355c4650b2ca6, type: 3}
|
||||
count: 0
|
||||
spawnProbability: 50
|
||||
healthIncrease: 10
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: meat
|
||||
m_EditorClassIdentifier:
|
||||
type: meat
|
||||
isUsable: 1
|
||||
image: {fileID: 21300000, guid: 375e980aa77781c4ab8cfa44cd5ed272, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: 7a5836fbd01854c16b578783b7286788, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ MonoBehaviour:
|
|||
m_Name: potion
|
||||
m_EditorClassIdentifier:
|
||||
type: potion
|
||||
isUsable: 1
|
||||
image: {fileID: 21300000, guid: 3d1af59b1c8e5f34780559d8fdeb4f5a, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: 7f262905c13704f01ad6e8514eed78e2, type: 3}
|
||||
count: 0
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ MonoBehaviour:
|
|||
m_Name: strawberry
|
||||
m_EditorClassIdentifier:
|
||||
type: strawberry
|
||||
isUsable: 1
|
||||
image: {fileID: 21300000, guid: bd36293e111dc8940a795114c430a028, type: 3}
|
||||
prefab: {fileID: 3041359854809748956, guid: 5baa5c19757e348da9a54e9ba0354bd4, type: 3}
|
||||
count: 0
|
||||
spawnProbability: 50
|
||||
healthIncrease: 10
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
BIN
Assets/Script/.DS_Store
vendored
BIN
Assets/Script/.DS_Store
vendored
Binary file not shown.
|
|
@ -67,8 +67,9 @@ public class ItemInventory : MonoBehaviour, IBeginDragHandler, IDragHandler, IEn
|
|||
|
||||
public void OnPointerClick(PointerEventData eventData)
|
||||
{
|
||||
//inventoryManager.SelectItem(item);
|
||||
|
||||
//inventoryManager.SelectItem(item);
|
||||
if (item.isUsable == false)return;
|
||||
if (inventoryManager.UseItem(item))
|
||||
{
|
||||
Destroy(gameObject);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ using UnityEngine.UI;
|
|||
public class item : ScriptableObject
|
||||
{
|
||||
public string type;
|
||||
public bool isUsable;
|
||||
public Sprite image;
|
||||
public GameObject prefab;
|
||||
public int count;
|
||||
|
|
|
|||
BIN
Assets/SimplePixelUI/.DS_Store
vendored
BIN
Assets/SimplePixelUI/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Spine Examples/.DS_Store
vendored
BIN
Assets/Spine Examples/.DS_Store
vendored
Binary file not shown.
BIN
Assets/Spine/.DS_Store
vendored
BIN
Assets/Spine/.DS_Store
vendored
Binary file not shown.
BIN
Assets/TextMesh Pro/.DS_Store
vendored
BIN
Assets/TextMesh Pro/.DS_Store
vendored
Binary file not shown.
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"com.unity.2d.animation": {
|
||||
"version": "9.0.3",
|
||||
"version": "9.1.1",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.2d.common": "8.0.1",
|
||||
"com.unity.2d.common": "8.0.2",
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.collections": "1.1.0",
|
||||
"com.unity.modules.animation": "1.0.0",
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.aseprite": {
|
||||
"version": "1.0.0",
|
||||
"version": "1.1.4",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.common": {
|
||||
"version": "8.0.1",
|
||||
"version": "8.0.2",
|
||||
"depth": 2,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -46,12 +46,12 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.2d.psdimporter": {
|
||||
"version": "8.0.2",
|
||||
"version": "8.0.5",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.2d.animation": "9.0.1",
|
||||
"com.unity.2d.common": "8.0.1",
|
||||
"com.unity.2d.animation": "9.1.1",
|
||||
"com.unity.2d.common": "8.0.2",
|
||||
"com.unity.2d.sprite": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
@ -63,12 +63,12 @@
|
|||
"dependencies": {}
|
||||
},
|
||||
"com.unity.2d.spriteshape": {
|
||||
"version": "9.0.2",
|
||||
"version": "9.0.3",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.mathematics": "1.1.0",
|
||||
"com.unity.2d.common": "8.0.1",
|
||||
"com.unity.2d.common": "8.0.2",
|
||||
"com.unity.modules.physics2d": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
}
|
||||
},
|
||||
"com.unity.2d.tilemap.extras": {
|
||||
"version": "3.1.1",
|
||||
"version": "3.1.2",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -95,11 +95,12 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.8.7",
|
||||
"version": "1.8.15",
|
||||
"depth": 3,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
"com.unity.mathematics": "1.2.1"
|
||||
"com.unity.mathematics": "1.2.1",
|
||||
"com.unity.modules.jsonserialize": "1.0.0"
|
||||
},
|
||||
"url": "https://packages.unity.com"
|
||||
},
|
||||
|
|
@ -132,14 +133,14 @@
|
|||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.2d.animation": "9.0.3",
|
||||
"com.unity.2d.animation": "9.1.1",
|
||||
"com.unity.2d.pixel-perfect": "5.0.3",
|
||||
"com.unity.2d.psdimporter": "8.0.2",
|
||||
"com.unity.2d.psdimporter": "8.0.5",
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.2d.spriteshape": "9.0.2",
|
||||
"com.unity.2d.spriteshape": "9.0.3",
|
||||
"com.unity.2d.tilemap": "1.0.0",
|
||||
"com.unity.2d.tilemap.extras": "3.1.1",
|
||||
"com.unity.2d.aseprite": "1.0.0"
|
||||
"com.unity.2d.tilemap.extras": "3.1.2",
|
||||
"com.unity.2d.aseprite": "1.1.4"
|
||||
}
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
|
|
|
|||
|
|
@ -1,2 +1,9 @@
|
|||
lastUpgrade=01014
|
||||
proj.pluginVersion=0.10.14
|
||||
proj.AppId=178135978803
|
||||
and.BundleId=com.playpool.MMORPG
|
||||
proj.classDir=Assets
|
||||
proj.ConstantsClassName=GPGSIds
|
||||
and.ResourceData=%3c%3fxml+version%3d%221.0%22+encoding%3d%22utf-8%22%3f%3e%0a%3c%21--Google+Play+game+services+IDs.+Save+this+file+as+res%2fvalues%2fgames-ids.xml+in+your+project.--%3e%0a%3cresources%3e%0a++%3c%21--app_id--%3e%0a++%3cstring+name%3d%22app_id%22+translatable%3d%22false%22%3e178135978803%3c%2fstring%3e%0a++%3c%21--package_name--%3e%0a++%3cstring+name%3d%22package_name%22+translatable%3d%22false%22%3ecom.playpool.MMORPG%3c%2fstring%3e%0a%3c%2fresources%3e
|
||||
and.ClientId=178135978803-ks0s5nmdlnujpic2tntm39mmuc39ehh6.apps.googleusercontent.com
|
||||
android.SetupDone=true
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<projectSettings>
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
|
||||
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
|
||||
</projectSettings>
|
||||
|
|
@ -139,7 +139,7 @@ PlayerSettings:
|
|||
loadStoreDebugModeEnabled: 0
|
||||
visionOSBundleVersion: 1.0
|
||||
tvOSBundleVersion: 1.0
|
||||
bundleVersion: 3.8
|
||||
bundleVersion: 3.9
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
|
|
@ -169,7 +169,7 @@ PlayerSettings:
|
|||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 1
|
||||
AndroidBundleVersionCode: 14
|
||||
AndroidBundleVersionCode: 15
|
||||
AndroidMinSdkVersion: 22
|
||||
AndroidTargetSdkVersion: 33
|
||||
AndroidPreferredInstallLocation: 1
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
m_EditorVersion: 2022.3.7f1
|
||||
m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)
|
||||
m_EditorVersion: 2022.3.33f1
|
||||
m_EditorVersionWithRevision: 2022.3.33f1 (b2c853adf198)
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user