diff --git a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab index fcc964f..b9c1928 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleFormationUI.prefab @@ -59,7 +59,7 @@ MonoBehaviour: type: 3} IconOffset: 5 IconWidth: 65 - HeightOffset: 80 + HeightOffset: 115 IconList: [] --- !u!1 &1449688029961108905 GameObject: @@ -374,17 +374,17 @@ PrefabInstance: - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_LocalScale.x - value: 1.1371 + value: 1.0848497 objectReference: {fileID: 0} - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_LocalScale.y - value: 1.1371 + value: 1.0848497 objectReference: {fileID: 0} - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_LocalScale.z - value: 1.1371 + value: 1.0848497 objectReference: {fileID: 0} - target: {fileID: 1687732571317619599, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} @@ -395,7 +395,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 5e49c65989cadc249b8cb41b11027781, + objectReference: {fileID: 21300000, guid: a45a44e60a3d80d4abd69aeb80ed3f15, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 93c614e..0f3efd3 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -339,7 +339,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 115 + value: 114 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -6597,7 +6597,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 109 + value: 108 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -6677,7 +6677,7 @@ PrefabInstance: type: 3} propertyPath: planet1 value: - objectReference: {fileID: 500077397} + objectReference: {fileID: 92487210} - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: planet2 @@ -6691,22 +6691,22 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].x - value: 5822.6196 + value: 5688 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].z - value: 3147.1504 + value: 2592 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 5400.5654 + value: 5422 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 3148.2441 + value: 3171 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -6746,7 +6746,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 106 + value: 105 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -11671,7 +11671,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 111 + value: 110 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -15366,111 +15366,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 285724485} m_CullTransparentMesh: 0 ---- !u!1001 &286802685 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 850140851} - m_Modifications: - - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: planet1 - value: - objectReference: {fileID: 390578864} - - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: planet2 - value: - objectReference: {fileID: 2097301896} - - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_Name - value: PlanetConnection - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_Positions.Array.data[0].x - value: 5182 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_Positions.Array.data[0].z - value: 2953 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_Positions.Array.data[1].x - value: 5400.5654 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_Positions.Array.data[1].z - value: 3148.2441 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_RootOrder - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} ---- !u!4 &286802686 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, - type: 3} - m_PrefabInstance: {fileID: 286802685} - m_PrefabAsset: {fileID: 0} --- !u!1001 &286909632 PrefabInstance: m_ObjectHideFlags: 0 @@ -26460,7 +26355,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 112 + value: 111 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -28532,7 +28427,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 5822.6196 + value: 5842 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -28542,7 +28437,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 3147.1504 + value: 3159 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -29877,7 +29772,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 113 + value: 112 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -36053,7 +35948,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 5274 + value: 5190 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -36063,7 +35958,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 2678 + value: 2595 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -36246,7 +36141,7 @@ PrefabInstance: type: 3} propertyPath: planet2 value: - objectReference: {fileID: 684650337} + objectReference: {fileID: 92487210} - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Name @@ -36265,12 +36160,12 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 5274 + value: 5688 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 2678 + value: 2592 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -36310,7 +36205,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 104 + value: 103 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -37464,7 +37359,7 @@ PrefabInstance: type: 3} propertyPath: planet1 value: - objectReference: {fileID: 1135185250} + objectReference: {fileID: 92487210} - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: planet2 @@ -37478,22 +37373,22 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].x - value: 6245 + value: 5688 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].z - value: 2491 + value: 2592 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 6104.679 + value: 6140 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 2834.6814 + value: 2904 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -37533,7 +37428,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 108 + value: 107 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -39130,7 +39025,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 6047 + value: 5974 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -39140,7 +39035,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 2159 + value: 2223 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -45996,7 +45891,6 @@ Transform: - {fileID: 771629757} - {fileID: 453712312} - {fileID: 1715046399} - - {fileID: 286802686} - {fileID: 684685623} - {fileID: 1150859385} - {fileID: 102187272} @@ -46012,6 +45906,7 @@ Transform: - {fileID: 1985410692} - {fileID: 1623782995} - {fileID: 877841778} + - {fileID: 1551981761} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -46941,7 +46836,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 118 + value: 117 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -48540,12 +48435,12 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 5274 + value: 5190 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 2678 + value: 2595 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -48585,7 +48480,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 110 + value: 109 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -61559,7 +61454,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 6245 + value: 6183 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -61569,7 +61464,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 2491 + value: 2549 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -62452,7 +62347,7 @@ PrefabInstance: type: 3} propertyPath: planet2 value: - objectReference: {fileID: 2036870729} + objectReference: {fileID: 92487210} - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Name @@ -62461,22 +62356,22 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].x - value: 5822.6196 + value: 5842 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].z - value: 3147.1504 + value: 3159 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 6104.679 + value: 5688 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 2834.6814 + value: 2592 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -62516,7 +62411,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 105 + value: 104 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -80349,7 +80244,7 @@ PrefabInstance: type: 3} propertyPath: planet2 value: - objectReference: {fileID: 732477668} + objectReference: {fileID: 92487210} - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Name @@ -80358,22 +80253,22 @@ PrefabInstance: - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].x - value: 6245 + value: 6183 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[0].z - value: 2491 + value: 2549 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].x - value: 6047 + value: 5688 objectReference: {fileID: 0} - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_Positions.Array.data[1].z - value: 2159 + value: 2592 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -80413,7 +80308,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 107 + value: 106 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -84119,6 +84014,111 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -4, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1551981760 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 850140851} + m_Modifications: + - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: planet1 + value: + objectReference: {fileID: 732477668} + - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: planet2 + value: + objectReference: {fileID: 92487210} + - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_Name + value: PlanetConnection + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_Positions.Array.data[0].x + value: 5974 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_Positions.Array.data[0].z + value: 2223 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_Positions.Array.data[1].x + value: 5688 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702121, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_Positions.Array.data[1].z + value: 2592 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_RootOrder + value: 118 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} +--- !u!4 &1551981761 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, + type: 3} + m_PrefabInstance: {fileID: 1551981760} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1553325649 PrefabInstance: m_ObjectHideFlags: 0 @@ -85621,8 +85621,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1589504682} - - component: {fileID: 1589504685} - - component: {fileID: 1589504684} - component: {fileID: 1589504683} m_Layer: 0 m_Name: Sphere @@ -85658,53 +85656,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1589504684 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589504681} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1589504685 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1589504681} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &1590972559 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1590972559, guid: f8bffe0306e53cb4b958afe65a7c7b2c, @@ -86545,7 +86496,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 114 + value: 113 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -91489,7 +91440,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 117 + value: 116 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -106116,7 +106067,7 @@ SpriteRenderer: m_Size: {x: 19.48, y: 12.82} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1927661908 @@ -109911,7 +109862,7 @@ PrefabInstance: - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} propertyPath: m_RootOrder - value: 116 + value: 115 objectReference: {fileID: 0} - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3} @@ -112321,7 +112272,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 6104.679 + value: 6140 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -112331,7 +112282,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 2834.6814 + value: 2904 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -115454,7 +115405,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 5400.5654 + value: 5422 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -115464,7 +115415,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: 3148.2441 + value: 3171 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} diff --git a/Assets/GWConquest/Scripts/Inventory.cs b/Assets/GWConquest/Scripts/Inventory.cs new file mode 100644 index 0000000..b5fcc14 --- /dev/null +++ b/Assets/GWConquest/Scripts/Inventory.cs @@ -0,0 +1,87 @@ +using UdpKit; +using Bolt; +using System.Linq; + +namespace GWConquest +{ + [System.Serializable] + public class ItemStack + { + public const int MaxStackSize = 50; + + public bool IsUnit; + public string ItemName; + public Unit Unit; + public bool Stackable; + public int Amount; + + public override string ToString() + { + if(IsUnit) + { + return "Unit(" + Unit.Class.ShortName + ")"; + } + else { + return "Item(" + ItemName + ")x" + Amount.ToString(); + } + } + + public static ItemStack FromItem(string itemName, int amount=1) + { + var item = ItemRegistry.Instance.GetEntry(itemName); + if(!item.Stackable && amount > 1) + { + BoltLog.Warn("Item {0} is not stackable to amount {1}", itemName, amount); + amount = 1; + } + return new ItemStack { + IsUnit = false, + ItemName = itemName, + Stackable = item.Stackable, + Amount = amount + }; + } + + public static ItemStack FromUnit(Unit unit) + { + return new ItemStack { + IsUnit = true, + Unit = unit, + Stackable = false, + Amount = 1 + }; + } + + } + + public class InventoryToken : BoltListToken + { + public override void WriteEntry(UdpPacket packet, ItemStack entry) + { + packet.WriteBool(entry.IsUnit); + packet.WriteString(entry.ItemName); + packet.WriteULong(entry.Unit.entity.NetworkId.PackedValue); + packet.WriteBool(entry.Stackable); + packet.WriteInt(entry.Amount); + } + + public override ItemStack ReadEntry(UdpPacket packet) + { + ItemStack item = new ItemStack(); + item.IsUnit = packet.ReadBool(); + item.ItemName = packet.ReadString(); + item.Unit = BoltNetwork.FindEntity(new NetworkId(packet.ReadULong()))?.GetComponent(); + item.Stackable = packet.ReadBool(); + item.Amount = packet.ReadInt(); + return item; + } + } + + public class Inventory : BoltList + { + public Inventory(IState _state, string _propertyName) : base(_state, _propertyName) { } + + public int StorageCapacity = int.MaxValue; + + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/TransportedItem.cs.meta b/Assets/GWConquest/Scripts/Inventory.cs.meta similarity index 100% rename from Assets/GWConquest/Scripts/TransportedItem.cs.meta rename to Assets/GWConquest/Scripts/Inventory.cs.meta diff --git a/Assets/GWConquest/Scripts/ItemRegistry.cs b/Assets/GWConquest/Scripts/ItemRegistry.cs new file mode 100644 index 0000000..76c9f35 --- /dev/null +++ b/Assets/GWConquest/Scripts/ItemRegistry.cs @@ -0,0 +1,48 @@ +using UnityEngine; +using System.Collections.Generic; + +namespace GWConquest +{ + public class ItemRegistry : MonoBehaviour + { + private static ItemRegistry _instance; + public static ItemRegistry Instance { + get { + if(_instance == null) + { + _instance = FindObjectOfType(); + } + return _instance; + } + } + + [System.Serializable] + public class ItemEntry { + public string Name; + public Sprite Icon; + public Color Color; + public bool Stackable = true; + } + + public ItemEntry[] Entries; + + private Dictionary itemMap = new Dictionary(); + + private void Awake() { + foreach(ItemEntry e in Entries) + { + itemMap.Add(e.Name, e); + } + } + + public ItemEntry GetEntry(string itemName) + { + if(itemMap.ContainsKey(itemName)){ + return itemMap[itemName]; + } + else return null; + } + } +} + + diff --git a/Assets/GWConquest/Scripts/ItemRegistry.cs.meta b/Assets/GWConquest/Scripts/ItemRegistry.cs.meta new file mode 100644 index 0000000..02b19be --- /dev/null +++ b/Assets/GWConquest/Scripts/ItemRegistry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 818bdd7bdeb19df429929843ed5ca985 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/TransportedItem.cs b/Assets/GWConquest/Scripts/TransportedItem.cs deleted file mode 100644 index 74193ae..0000000 --- a/Assets/GWConquest/Scripts/TransportedItem.cs +++ /dev/null @@ -1,43 +0,0 @@ -using UdpKit; -using Bolt; - -namespace GWConquest -{ - [System.Serializable] - public class TransportedItem - { - public bool IsUnit; - public string ItemName; - public Unit Unit; - public bool Stackable; - public int Amount; - } - - public class InventoryToken : BoltListToken - { - public override void WriteEntry(UdpPacket packet, TransportedItem entry) - { - packet.WriteBool(entry.IsUnit); - packet.WriteString(entry.ItemName); - packet.WriteULong(entry.Unit.entity.NetworkId.PackedValue); - packet.WriteBool(entry.Stackable); - packet.WriteInt(entry.Amount); - } - - public override TransportedItem ReadEntry(UdpPacket packet) - { - TransportedItem item = new TransportedItem(); - item.IsUnit = packet.ReadBool(); - item.ItemName = packet.ReadString(); - item.Unit = BoltNetwork.FindEntity(new NetworkId(packet.ReadULong()))?.GetComponent(); - item.Stackable = packet.ReadBool(); - item.Amount = packet.ReadInt(); - return item; - } - } - - public class Inventory : BoltList - { - public Inventory(IState _state, string _propertyName) : base(_state, _propertyName) {} - } -} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs index 784884b..15cd127 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs @@ -244,6 +244,8 @@ namespace GWConquest DistrictIcons.gameObject.SetActive(false); DistrictLines.gameObject.SetActive(false); + PlanetName.gameObject.SetActive(false); + BattleUI.gameObject.SetActive(true); BattleUI.SetBattle(battle); @@ -257,6 +259,8 @@ namespace GWConquest DistrictIcons.gameObject.SetActive(true); DistrictLines.gameObject.SetActive(true); + PlanetName.gameObject.SetActive(true); + FleetIcons.gameObject.SetActive(true); SpaceIndicatorPanel.SetActive(true); GroundIndicatorPanel.SetActive(true); diff --git a/Assets/GWConquest/Textures/Icons/Caine.png b/Assets/GWConquest/Textures/Icons/Caine.png deleted file mode 100644 index 09bdd48..0000000 Binary files a/Assets/GWConquest/Textures/Icons/Caine.png and /dev/null differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png b/Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png new file mode 100644 index 0000000..9d054fd Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png differ diff --git a/Assets/GWConquest/Textures/Icons/Caine.png.meta b/Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png.meta similarity index 97% rename from Assets/GWConquest/Textures/Icons/Caine.png.meta rename to Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png.meta index 2137360..79f424c 100644 --- a/Assets/GWConquest/Textures/Icons/Caine.png.meta +++ b/Assets/GWConquest/Textures/Icons/Char_Agent_Sarrow.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 5e49c65989cadc249b8cb41b11027781 +guid: 1e0d18fe0833d304c9cebaa7977c98dc TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: 2 mipBias: -100 wrapU: 1 diff --git a/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png b/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png new file mode 100644 index 0000000..2a5178e Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png.meta b/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png.meta new file mode 100644 index 0000000..920c4b6 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Caras_Enceladon.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: bb5af90a223b3c34baf6079c6659fbd8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png b/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png new file mode 100644 index 0000000..72b4366 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png.meta b/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png.meta new file mode 100644 index 0000000..967d98c --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Castor_Caine.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: a45a44e60a3d80d4abd69aeb80ed3f15 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png b/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png new file mode 100644 index 0000000..51e35a3 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png.meta b/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png.meta new file mode 100644 index 0000000..d193423 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Kerner_Holg.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 05ce792607c8dac49b9729d2952b5850 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png b/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png new file mode 100644 index 0000000..cc94029 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png.meta b/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png.meta new file mode 100644 index 0000000..f99c2bb --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Manaius_Volck.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: ce1d28b5a3bff024db7fc721c97962c1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png b/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png new file mode 100644 index 0000000..5a7bd20 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png.meta b/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png.meta new file mode 100644 index 0000000..772d8f6 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Mimey_Cattai.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 7f9b0152541037145acbf79b35daa031 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png b/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png new file mode 100644 index 0000000..f5f883e Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png.meta b/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png.meta new file mode 100644 index 0000000..50f6c3b --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Sarv_Tekal.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 12dc15e5004c3a046a88ca5500bc3de8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png b/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png new file mode 100644 index 0000000..22b42d2 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png differ diff --git a/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png.meta b/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png.meta new file mode 100644 index 0000000..d5376f3 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Char_Varrius_Praal.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: f6af06c635baef64587810accc91cbf6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index 0192625..a756d89 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb index dfc3e62..c4c5ca3 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json index 2374086..74f130c 100644 --- a/Assets/Photon/PhotonBolt/project.json +++ b/Assets/Photon/PhotonBolt/project.json @@ -707,6 +707,23 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "Inventory", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeProtocolToken, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "PacketMaxBits": 512, @@ -1578,6 +1595,23 @@ "ExtrapolationMaxFrames": 9, "SnapMagnitude": 10.0 } + }, + { + "Name": "Inventory", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeProtocolToken, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } } ], "PacketMaxBits": 512, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index cb69792..9d5c90f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,4 @@ EditorBuildSettings: - enabled: 1 path: Assets/GWConquest/Scenes/GalaxyMap.unity guid: 9f36bfc6cf7983247a4db014bed21e46 - - enabled: 0 - path: Assets/GWConquest/Scenes/GalaxyMapTest.unity - guid: b4406a1d42081034781f31c28e7402ad m_configObjects: {}