new CP
This commit is contained in:
@@ -29280,7 +29280,6 @@ GameObject:
|
||||
- component: {fileID: -4779029823867914901}
|
||||
- component: {fileID: -1351644667867233305}
|
||||
- component: {fileID: -1760829570028262131}
|
||||
- component: {fileID: 3298402673612428253}
|
||||
m_Layer: 0
|
||||
m_Name: Player
|
||||
m_TagString: Untagged
|
||||
@@ -29417,16 +29416,13 @@ MonoBehaviour:
|
||||
pnameTxt: {fileID: 1318931860792545326}
|
||||
body: {fileID: 5431987895376475546}
|
||||
trailMgr: {fileID: 5995183602835295541}
|
||||
movingSpeed: 0.18
|
||||
turningSmoothFactor: 0.048
|
||||
movingSpeed: 0.25
|
||||
turningSmoothFactor: 0.08
|
||||
joystick: {fileID: 0}
|
||||
boosting: 0
|
||||
m_Input: {x: 0, y: 0}
|
||||
rubberbandSmoothness: 0.6
|
||||
showDebugHUD: 0
|
||||
ErrorInputCount: 0
|
||||
ErrorStateCount: 0
|
||||
RubberBandsCount: 0
|
||||
DeathEffect: {fileID: 4110590249144947089, guid: e589aa1604021b34fb85d937ec41f47a, type: 3}
|
||||
debrisEffect: {fileID: 5762695594881667428, guid: 37e902f63f5e1304a880b0bfb7e9c2c8, type: 3}
|
||||
boostStartEffect:
|
||||
@@ -29444,7 +29440,6 @@ MonoBehaviour:
|
||||
normalPitch: 1
|
||||
boostedPitch: 2
|
||||
startedTime: 0
|
||||
MovementSmoothnessFactor: 0.8
|
||||
--- !u!114 &5995183602835295541
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -29622,40 +29617,6 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!114 &3298402673612428253
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5431987895376475548}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2f74aedd71d9a4f55b3ce499326d45fb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
syncMode: 0
|
||||
syncInterval: 0.1
|
||||
clientAuthority: 0
|
||||
sendInterval: 0.02
|
||||
syncPosition: 1
|
||||
syncRotation: 1
|
||||
syncScale: 0
|
||||
interpolatePosition: 1
|
||||
interpolateRotation: 1
|
||||
interpolateScale: 0
|
||||
bufferTimeMultiplier: 1
|
||||
bufferSizeLimit: 64
|
||||
catchupThreshold: 5
|
||||
catchupMultiplier: 0.1
|
||||
onlySyncOnChange: 0
|
||||
bufferResetMultiplier: 5
|
||||
positionSensitivity: 0.01
|
||||
rotationSensitivity: 0.01
|
||||
scaleSensitivity: 0.01
|
||||
showGizmos: 0
|
||||
showOverlay: 0
|
||||
overlayColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
--- !u!1 &5431987895404559667
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -38590,6 +38590,140 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4616813818352136, guid: b0bf0429419f52c44b84faf398e13aca, type: 3}
|
||||
m_PrefabInstance: {fileID: 1666165514}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &124480228
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 124480229}
|
||||
- component: {fileID: 124480231}
|
||||
- component: {fileID: 124480230}
|
||||
m_Layer: 5
|
||||
m_Name: All_skins_aquired (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &124480229
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 124480228}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1668434981}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 106}
|
||||
m_SizeDelta: {x: 0, y: 97.99}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &124480230
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 124480228}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: All Designs Acquired
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255388
|
||||
m_fontColor: {r: 0.11151922, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 33.4
|
||||
m_fontSizeBase: 33.4
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 1.38
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &124480231
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 124480228}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1001 &124535868
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -38782,7 +38916,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.000030517578, y: -236.7666}
|
||||
m_AnchoredPosition: {x: -0.000030517578, y: -211.3}
|
||||
m_SizeDelta: {x: 0, y: 82.455154}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1001 &124856242
|
||||
@@ -96386,6 +96520,140 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 263062765}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &263158930
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 263158931}
|
||||
- component: {fileID: 263158933}
|
||||
- component: {fileID: 263158932}
|
||||
m_Layer: 5
|
||||
m_Name: All_skins_aquired (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &263158931
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 263158930}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1685667059}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 106}
|
||||
m_SizeDelta: {x: 0, y: 97.99}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &263158932
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 263158930}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: All Designs Acquired
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255388
|
||||
m_fontColor: {r: 0.11151922, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 33.4
|
||||
m_fontSizeBase: 33.4
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 1.38
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &263158933
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 263158930}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &263244420
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -339019,6 +339287,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 53edd1304ce7ec14fa61e457a4745d7a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Camera: {fileID: 0}
|
||||
Rotate: 0
|
||||
DecreaseCameraPanSpeed: 1
|
||||
CameraUpperHeightBound: 0
|
||||
CameraLowerHeightBound: 0
|
||||
--- !u!4 &828023762
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -372957,6 +373230,11 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 953854202}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!95 &954150012 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 9047157314865308853, guid: c9dc4bdc6b892f44a8ad0ba24478ad3e, type: 3}
|
||||
m_PrefabInstance: {fileID: 1886841019}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &954236834
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -383545,7 +383823,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
chestOpenPopup: {fileID: 1381291881}
|
||||
EpicChestData: {fileID: 11400000, guid: 7223f5614b378714c81fdbdd42ae7ea6, type: 2}
|
||||
chestAnim: {fileID: 866143677492591224}
|
||||
chestAnimLucky: {fileID: 1758683720}
|
||||
chestAnimEpic: {fileID: 954150012}
|
||||
gemsDrop: {fileID: 2048531117}
|
||||
goldDrop: {fileID: 1557795455}
|
||||
skinDrop: {fileID: 1361182204}
|
||||
@@ -455272,6 +455551,140 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1170978144}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1171553588
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1171553589}
|
||||
- component: {fileID: 1171553591}
|
||||
- component: {fileID: 1171553590}
|
||||
m_Layer: 5
|
||||
m_Name: All_skins_aquired
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1171553589
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1171553588}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 761771374505339675}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -0.000030517578, y: 106}
|
||||
m_SizeDelta: {x: 0, y: 97.99}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &1171553590
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1171553588}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: All Designs Acquired
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255388
|
||||
m_fontColor: {r: 0.11151922, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 33.4
|
||||
m_fontSizeBase: 33.4
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 1.38
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1171553591
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1171553588}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &1172310401
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -456912,6 +457325,140 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4a1b0b67c2527ba49acad77a036a9c76, type: 3}
|
||||
--- !u!1 &1179757560
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1179757561}
|
||||
- component: {fileID: 1179757563}
|
||||
- component: {fileID: 1179757562}
|
||||
m_Layer: 5
|
||||
m_Name: All_skins_aquired (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1179757561
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1179757560}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1636883321}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 106}
|
||||
m_SizeDelta: {x: 0, y: 97.99}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!114 &1179757562
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1179757560}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: All Designs Acquired
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_sharedMaterial: {fileID: 7374927986402738804, guid: c1482dbce654844b9ba1c753cbea5d80, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4278255388
|
||||
m_fontColor: {r: 0.11151922, g: 1, b: 0, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 33.4
|
||||
m_fontSizeBase: 33.4
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 1.38
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 1
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1179757563
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1179757560}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1001 &1179835627
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -616850,7 +617397,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.0030517578, y: -64.391}
|
||||
m_AnchoredPosition: {x: 0.004272461, y: -64.391}
|
||||
m_SizeDelta: {x: 2571.0999, y: 1059.4}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &1565639527
|
||||
@@ -662299,6 +662846,7 @@ RectTransform:
|
||||
- {fileID: 1122907918}
|
||||
- {fileID: 2001224173}
|
||||
- {fileID: 165472535}
|
||||
- {fileID: 1179757561}
|
||||
- {fileID: 1658165981}
|
||||
m_Father: {fileID: 1565639526}
|
||||
m_RootOrder: 2
|
||||
@@ -681407,7 +681955,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1658165981
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -681420,7 +681968,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1636883321}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@@ -688581,6 +689129,7 @@ RectTransform:
|
||||
- {fileID: 572970518}
|
||||
- {fileID: 1557598238}
|
||||
- {fileID: 852900689}
|
||||
- {fileID: 124480229}
|
||||
- {fileID: 2136881938}
|
||||
m_Father: {fileID: 1565639526}
|
||||
m_RootOrder: 1
|
||||
@@ -692205,6 +692754,7 @@ RectTransform:
|
||||
- {fileID: 1940612121}
|
||||
- {fileID: 2023573810}
|
||||
- {fileID: 1717680122}
|
||||
- {fileID: 263158931}
|
||||
- {fileID: 1945807495}
|
||||
m_Father: {fileID: 1565639526}
|
||||
m_RootOrder: 3
|
||||
@@ -740819,6 +741369,141 @@ MonoBehaviour:
|
||||
precomputeOutline: 0
|
||||
bakeKeys: []
|
||||
bakeValues: []
|
||||
--- !u!1001 &1758683718
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2082703002}
|
||||
m_Modifications:
|
||||
- target: {fileID: 126072408845613720, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 126072409313516234, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 126072409956200205, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5697737897389195191, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6898066031926158978, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6966245572786679779, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6966245572786694653, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8457743634964509183, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157313462388590, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157313732819034, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314061025690, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314392591337, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314459193268, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314641861130, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308848, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Blue_chest
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308848, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308848, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157315292741450, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
--- !u!4 &1758683719 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 9047157314865308854, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
m_PrefabInstance: {fileID: 1758683718}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!95 &1758683720 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 9047157314865308853, guid: d54906be01333eb439c49f86f758f0a2, type: 3}
|
||||
m_PrefabInstance: {fileID: 1758683718}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1759200000 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4409775485178438, guid: ee7d617c257823f4b8e48308f54912e6, type: 3}
|
||||
@@ -768160,6 +768845,11 @@ MonoBehaviour:
|
||||
btnEpicBox: {fileID: 1636883323}
|
||||
btnLegendaryBox: {fileID: 1685667061}
|
||||
boxPrices: 32000000c8000000f4010000e8030000
|
||||
AllOwnedTooltips:
|
||||
- {fileID: 1171553588}
|
||||
- {fileID: 124480228}
|
||||
- {fileID: 1179757560}
|
||||
- {fileID: 263158930}
|
||||
newBoxPanel: {fileID: 1292950960}
|
||||
newSkinPanel: {fileID: 1078409996}
|
||||
goldsPanel: {fileID: 234164764}
|
||||
@@ -785061,6 +785751,10 @@ PrefabInstance:
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6966245572786679779, guid: c9dc4bdc6b892f44a8ad0ba24478ad3e, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6966245572786694653, guid: c9dc4bdc6b892f44a8ad0ba24478ad3e, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 6
|
||||
@@ -785107,7 +785801,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: c9dc4bdc6b892f44a8ad0ba24478ad3e, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9047157314865308854, guid: c9dc4bdc6b892f44a8ad0ba24478ad3e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@@ -810974,7 +811668,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1945807495
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -810987,7 +811681,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1685667059}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@@ -846147,7 +846841,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2024589727
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -876491,6 +877185,7 @@ Transform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 1.19}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1758683719}
|
||||
- {fileID: 1886841020}
|
||||
m_Father: {fileID: 1699924443}
|
||||
m_RootOrder: 5
|
||||
@@ -905741,7 +906436,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2136881938
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -905754,7 +906449,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1668434981}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@@ -907769,6 +908464,7 @@ RectTransform:
|
||||
- {fileID: 1061375766}
|
||||
- {fileID: 226118669}
|
||||
- {fileID: 2024589727}
|
||||
- {fileID: 1171553589}
|
||||
m_Father: {fileID: 1565639526}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -907945,7 +908641,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!95 &866143677492591224
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
|
||||
@@ -5127,7 +5127,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6b0fecffa3f624585964b0d0eb21b18e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Port: 2501
|
||||
Port: 2500
|
||||
DualMode: 1
|
||||
NoDelay: 1
|
||||
Interval: 10
|
||||
@@ -6993,7 +6993,7 @@ MonoBehaviour:
|
||||
minFOV: 11
|
||||
FOVmultiplier: 5
|
||||
smoothness: 7
|
||||
updateMode: 0
|
||||
updateMode: 3
|
||||
--- !u!1 &697893402
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -13,7 +13,8 @@ public class ChestOpener : MonoBehaviour
|
||||
public GameObject chestOpenPopup;
|
||||
public ChestDataObject EpicChestData;
|
||||
public bool active => chestOpenPopup.activeSelf;
|
||||
public Animator chestAnim;
|
||||
public Animator chestAnimLucky;
|
||||
public Animator chestAnimEpic;
|
||||
public GameObject gemsDrop;
|
||||
public GameObject goldDrop;
|
||||
public GameObject skinDrop;
|
||||
@@ -25,10 +26,19 @@ public class ChestOpener : MonoBehaviour
|
||||
public GameObject okButton;
|
||||
void Awake(){
|
||||
instance = this;
|
||||
|
||||
okButton.GetComponent<Button>().onClick.AddListener(OnOkButton);
|
||||
}
|
||||
|
||||
void OnOkButton(){
|
||||
chestOpenPopup.SetActive(false);
|
||||
chestAnimLucky.gameObject.SetActive(false);
|
||||
chestAnimEpic.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public async void OpenChest(ChestDataObject chestData){
|
||||
|
||||
|
||||
chestOpenPopup.SetActive(true);
|
||||
okButton.SetActive(false);
|
||||
|
||||
@@ -94,16 +104,26 @@ public class ChestOpener : MonoBehaviour
|
||||
|
||||
skinBgParticle.startColor = new Color(bgColor.r,bgColor.g,bgColor.b, skinBgParticle.startColor.a);
|
||||
}
|
||||
|
||||
chestAnim.CrossFadeInFixedTime("openAnim",0.1f);
|
||||
|
||||
|
||||
if(chestData.name.ToLower().Contains("epic")){
|
||||
chestAnimEpic.CrossFadeInFixedTime("openAnim",0.1f);
|
||||
chestAnimEpic.gameObject.SetActive(true);
|
||||
}else{
|
||||
chestAnimLucky.CrossFadeInFixedTime("openAnim",0.1f);
|
||||
chestAnimLucky.gameObject.SetActive(true);
|
||||
|
||||
}
|
||||
|
||||
|
||||
//Chest opens here
|
||||
confettiFX.Play();
|
||||
StartCoroutine(PlaySFX(chestData == EpicChestData));
|
||||
Debug.Log("Chest opening");
|
||||
while (chestAnim.GetCurrentAnimatorStateInfo(0).IsName("openAnim")){
|
||||
await Task.Delay(10);
|
||||
}
|
||||
// while (chestAnim.GetCurrentAnimatorStateInfo(0).IsName("openAnim")){
|
||||
// await Task.Delay(10);
|
||||
// }
|
||||
StartCoroutine(EnableOkayButton());
|
||||
Debug.Log("Chest opened");
|
||||
|
||||
DBmanager.SetGems(DBmanager.Gems + gemsCount);
|
||||
@@ -130,4 +150,10 @@ public class ChestOpener : MonoBehaviour
|
||||
confettiFX.GetComponent<AudioSource>().Play();
|
||||
|
||||
}
|
||||
|
||||
IEnumerator EnableOkayButton(){
|
||||
yield return new WaitForSeconds(1.5f);
|
||||
|
||||
okButton.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ public class DesignLab : MonoBehaviour
|
||||
public Building designLabBuilding;
|
||||
public Button btnCommonBox,btnRareBox,btnEpicBox,btnLegendaryBox;
|
||||
public int[] boxPrices;
|
||||
public GameObject[] AllOwnedTooltips;
|
||||
public GameObject newBoxPanel;
|
||||
public GameObject newSkinPanel;
|
||||
public GameObject goldsPanel;
|
||||
@@ -92,6 +93,28 @@ public class DesignLab : MonoBehaviour
|
||||
List<GameObject> blueprintItems = new List<GameObject>();
|
||||
void RefreshBoxes(){
|
||||
// OnBoxSelected(-1);
|
||||
List<SkinShopItemData> availableSkins0 = new List<SkinShopItemData>();
|
||||
List<SkinShopItemData> availableSkins1 = new List<SkinShopItemData>();
|
||||
List<SkinShopItemData> availableSkins2 = new List<SkinShopItemData>();
|
||||
List<SkinShopItemData> availableSkins3 = new List<SkinShopItemData>();
|
||||
|
||||
foreach(SkinShopItemData item in SkinShopManager.SkinsData.skins){
|
||||
if(DBmanager.GetSkinIdByName(item.name) >=0){continue;}
|
||||
if(item.skinType == SkinType.Base){
|
||||
availableSkins0.Add(item);
|
||||
}else if( item.skinType == SkinType.Rare){
|
||||
availableSkins1.Add(item);
|
||||
}else if(item.skinType == SkinType.Epic){
|
||||
availableSkins2.Add(item);
|
||||
}else if( item.skinType == SkinType.Legendary){
|
||||
availableSkins3.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
AllOwnedTooltips[0].SetActive(availableSkins0.Count <= 0);
|
||||
AllOwnedTooltips[1].SetActive(availableSkins1.Count <= 0);
|
||||
AllOwnedTooltips[2].SetActive(availableSkins2.Count <= 0);
|
||||
AllOwnedTooltips[3].SetActive(availableSkins3.Count <= 0);
|
||||
|
||||
btnCommonBox.transform.GetChild(1).gameObject.SetActive(false);
|
||||
btnRareBox.transform.GetChild(1).gameObject.SetActive(false);
|
||||
|
||||
@@ -6,7 +6,7 @@ using UnityEngine.SceneManagement;
|
||||
|
||||
public class MaintainceChecker : MonoBehaviour
|
||||
{
|
||||
public static int version = 51;
|
||||
public static int version = 54;
|
||||
public static MaintainceChecker instance;
|
||||
public int checkInterval = 30;
|
||||
float t;
|
||||
|
||||
@@ -60,20 +60,16 @@ public class SpaceshipController : NetworkBehaviour
|
||||
private float minTimeBetweenTicks;
|
||||
private const float SERVER_TICK_RATE = 30f;
|
||||
private const int BUFFER_SIZE = 2048;
|
||||
private const bool CUSTOM_NET_TRANSFORM = false;
|
||||
private const bool CUSTOM_NET_TRANSFORM = true;
|
||||
private float ERROR_THRESHOLD =0.25f;
|
||||
private int MIN_ERROR_COUNT = 10;
|
||||
public bool showDebugHUD = false;
|
||||
private double clientNetworkRTT;
|
||||
|
||||
public InputState[] clientInputBuffer;
|
||||
public InputState[] serverInputBuffer;
|
||||
public PlayerState[] clientStateBuffer;
|
||||
public PlayerState[] serverStateBuffer;
|
||||
public Queue<InputState> inputQueue;
|
||||
public PlayerState[] stateBuffer;
|
||||
|
||||
[SerializeField]private int ErrorInputCount;
|
||||
[SerializeField]private int ErrorStateCount;
|
||||
[SerializeField]private int RubberBandsCount;
|
||||
public GameObject DeathEffect;
|
||||
public GameObject debrisEffect;
|
||||
// public GameObject boostStartEffect;
|
||||
@@ -231,10 +227,9 @@ public class SpaceshipController : NetworkBehaviour
|
||||
void Start()
|
||||
{
|
||||
clientInputBuffer = new InputState[BUFFER_SIZE];
|
||||
serverInputBuffer = new InputState[BUFFER_SIZE];
|
||||
clientStateBuffer = new PlayerState[BUFFER_SIZE];
|
||||
serverStateBuffer = new PlayerState[BUFFER_SIZE];
|
||||
NetworkTime.PingFrequency = SERVER_TICK_RATE;
|
||||
inputQueue = new Queue<InputState>();
|
||||
stateBuffer = new PlayerState[BUFFER_SIZE];
|
||||
|
||||
minTimeBetweenTicks = 1f / SERVER_TICK_RATE;
|
||||
string[] args = System.Environment.GetCommandLineArgs();
|
||||
for (int i = 0; i < args.Length; i++)
|
||||
@@ -317,20 +312,14 @@ public class SpaceshipController : NetworkBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
int timeInMillis => (int)(NetworkTime.time * 1000);
|
||||
int roundedTime => Mathf.FloorToInt((float)timeInMillis / 100f) * 100;
|
||||
|
||||
int lastClientUpdateTime = 0;
|
||||
Vector3 lineCorrection;
|
||||
float scale => Mathf.Clamp(1 + (trailTime * _scaleMultiplier), 1, 10);
|
||||
long lastTime ;
|
||||
|
||||
void Update()
|
||||
{
|
||||
#if UNITY_EDITOR
|
||||
// Debug.Log(FindObjectsOfType<PickupItem>().Length);
|
||||
#endif
|
||||
if (joystick == null) { joystick = FindObjectOfType<Joystick>(); if(joystick==null){return;} }
|
||||
|
||||
if (MinigameManager.instance.isRanked && !MinigameManager.instance.RankedGameStarted) { return; }
|
||||
distanceFromCenter = Vector3.Distance(transform.position, Vector3.zero);
|
||||
@@ -343,6 +332,8 @@ public class SpaceshipController : NetworkBehaviour
|
||||
if (dead) { return; }
|
||||
|
||||
if(isLocalPlayer){
|
||||
if (joystick == null) { joystick = FindObjectOfType<Joystick>(); if(joystick==null){return;} }
|
||||
|
||||
input = joystick.input;
|
||||
if (Input.GetKeyDown(KeyCode.F))
|
||||
{
|
||||
@@ -361,56 +352,42 @@ public class SpaceshipController : NetworkBehaviour
|
||||
DBmanager.SetMostTime((int)survivalTime);
|
||||
}
|
||||
SceneData.SetTimerTxt(survivalTime);
|
||||
|
||||
if(CUSTOM_NET_TRANSFORM){
|
||||
body.position = Vector3.Lerp(body.position,targetState.Position,MovementSmoothnessFactor * movingSpeed * Vector2.Distance(targetState.Position, body.position));
|
||||
body.rotation = Quaternion.Lerp(body.rotation, targetState.Rotation,MovementSmoothnessFactor*movingSpeed);
|
||||
}
|
||||
// Debug.Log(lastTime - currentTick);
|
||||
lastTime = targetState.Tick;
|
||||
if(CUSTOM_NET_TRANSFORM){
|
||||
CameraFollower.UpdateFrame();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
timer += Time.deltaTime;
|
||||
while(timer >= minTimeBetweenTicks){
|
||||
timer -= minTimeBetweenTicks;
|
||||
if(isServer){
|
||||
HandleTick();
|
||||
}else if(isLocalPlayer){
|
||||
ClientHandleTick();
|
||||
}
|
||||
currentTick++;
|
||||
}
|
||||
|
||||
// return;
|
||||
|
||||
}
|
||||
|
||||
void FixedUpdate(){
|
||||
// timer += Time.deltaTime;
|
||||
|
||||
// while(timer >= minTimeBetweenTicks){
|
||||
// timer -= minTimeBetweenTicks;
|
||||
// HandleTick();
|
||||
// currentTick++;
|
||||
// }
|
||||
if (MinigameManager.instance.isRanked && !MinigameManager.instance.RankedGameStarted) { return; }
|
||||
|
||||
HandleTick();
|
||||
currentTick++;
|
||||
}
|
||||
Vector3 serverPosition => serverStateBuffer[bufferIndex].Position;
|
||||
Vector3 clientPosition => clientStateBuffer[bufferIndex].Position;
|
||||
int curBufferIndex;
|
||||
int errorCounter = 0;
|
||||
int bufferIndex => currentTick % BUFFER_SIZE;
|
||||
int ticksGap => (int)(clientNetworkRTT * SERVER_TICK_RATE);
|
||||
int latencyBufferIndex {
|
||||
get{
|
||||
int val =(int)(bufferIndex - (clientNetworkRTT * SERVER_TICK_RATE));
|
||||
if(val < 0){
|
||||
val = BUFFER_SIZE - val;
|
||||
}
|
||||
if(val >= BUFFER_SIZE || val < 0){
|
||||
Debug.LogError(val + " is bigger than buffer size, latency: " + clientNetworkRTT);
|
||||
val = BUFFER_SIZE-1;
|
||||
}
|
||||
return val;
|
||||
if(!isLocalPlayer && !isServer){
|
||||
transform.position = latestServerState.Position;
|
||||
transform.rotation = latestServerState.Rotation;
|
||||
}
|
||||
}
|
||||
public float MovementSmoothnessFactor = 0.1f;
|
||||
|
||||
#region Movement
|
||||
IEnumerator SendToClient(PlayerState statePayload)
|
||||
{
|
||||
yield return new WaitForSeconds(0.02f);
|
||||
|
||||
OnServerMovementState(statePayload);
|
||||
}
|
||||
void HandleTick(){
|
||||
#region obsoleteCommented
|
||||
/*
|
||||
curBufferIndex = bufferIndex;
|
||||
if(isLocalPlayer){
|
||||
// HandleInput(input);
|
||||
@@ -485,11 +462,167 @@ public class SpaceshipController : NetworkBehaviour
|
||||
{
|
||||
speed = movingSpeed * speedMultiplier;
|
||||
}
|
||||
}else{ // not server
|
||||
engineAudio.pitch = Mathf.Lerp(engineAudio.pitch, (boosting) ? boostedPitch : normalPitch, 0.1f);
|
||||
}*/
|
||||
#endregion
|
||||
CheckForPickups();
|
||||
if (boosting && scale > 1)
|
||||
{
|
||||
speed = movingSpeed * 2 * speedMultiplier;
|
||||
DecreaseTrail(Time.deltaTime * boostConsumption * 0.5f);
|
||||
}
|
||||
else
|
||||
{
|
||||
speed = movingSpeed * speedMultiplier;
|
||||
}
|
||||
|
||||
int bufferIndex = -1;
|
||||
while(inputQueue.Count > 0){
|
||||
InputState inputState = inputQueue.Dequeue();
|
||||
|
||||
bufferIndex = inputState.Tick % BUFFER_SIZE;
|
||||
|
||||
PlayerState statePayload = ProcessMovement(inputState);
|
||||
stateBuffer[bufferIndex] = statePayload;
|
||||
}
|
||||
|
||||
if(bufferIndex != -1){
|
||||
StartCoroutine(SendToClient(stateBuffer[bufferIndex]));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ClientHandleTick(){
|
||||
engineAudio.pitch = Mathf.Lerp(engineAudio.pitch, (boosting) ? boostedPitch : normalPitch, 0.1f);
|
||||
|
||||
if (!latestServerState.Equals(default(PlayerState)) &&
|
||||
(lastProcessedState.Equals(default(PlayerState)) ||
|
||||
!latestServerState.Equals(lastProcessedState)))
|
||||
{
|
||||
// Debug.Log("Consider Reconciliation");
|
||||
HandleServerReconciliation();
|
||||
}
|
||||
|
||||
int bufferIndex = currentTick % BUFFER_SIZE;
|
||||
|
||||
// Add payload to inputBuffer
|
||||
InputState inputPayload = new InputState();
|
||||
inputPayload.Tick = currentTick;
|
||||
inputPayload.Input = joystick.input;
|
||||
clientInputBuffer[bufferIndex] = inputPayload;
|
||||
|
||||
// Add payload to stateBuffer
|
||||
stateBuffer[bufferIndex] = ProcessMovement(inputPayload);
|
||||
if(isLocalPlayer){
|
||||
CameraFollower.UpdateFrame();
|
||||
}
|
||||
// Send input to server
|
||||
StartCoroutine(SendToServer(inputPayload));
|
||||
}
|
||||
|
||||
|
||||
public void OnClientInput(InputState inputPayload){
|
||||
if(isServer){
|
||||
m_OnClientInput(inputPayload);
|
||||
}else{
|
||||
CmdOnClientInput(inputPayload);
|
||||
}
|
||||
}
|
||||
|
||||
[Command]
|
||||
public void CmdOnClientInput(InputState inputPayload){
|
||||
m_OnClientInput(inputPayload);
|
||||
}
|
||||
|
||||
public void m_OnClientInput(InputState inputPayload)
|
||||
{
|
||||
inputQueue.Enqueue(inputPayload);
|
||||
}
|
||||
|
||||
private PlayerState latestServerState;
|
||||
private PlayerState lastProcessedState;
|
||||
|
||||
void HandleServerReconciliation()
|
||||
{
|
||||
lastProcessedState = latestServerState;
|
||||
|
||||
int serverStateBufferIndex = latestServerState.Tick % BUFFER_SIZE;
|
||||
float positionError = Vector3.Distance(latestServerState.Position, stateBuffer[serverStateBufferIndex].Position);
|
||||
float rotationError = CustomExtensions.QuaternionExtensions.Difference(latestServerState.Rotation, stateBuffer[serverStateBufferIndex].Rotation);
|
||||
|
||||
if (positionError > 0.001f || !latestServerState.Rotation.Approximately(stateBuffer[serverStateBufferIndex].Rotation, 0.0001f))
|
||||
{
|
||||
Debug.Log($"We have to reconcile bro, Errors\npos:{positionError}, rot:{rotationError}");
|
||||
// Rewind & Replay
|
||||
transform.position = latestServerState.Position;
|
||||
transform.rotation = latestServerState.Rotation;
|
||||
|
||||
// Update buffer at index of latest server state
|
||||
stateBuffer[serverStateBufferIndex] = latestServerState;
|
||||
|
||||
// Now re-simulate the rest of the ticks up to the current tick on the client
|
||||
int tickToProcess = latestServerState.Tick + 1;
|
||||
|
||||
while (tickToProcess < currentTick)
|
||||
{
|
||||
int bufferIndex = tickToProcess % BUFFER_SIZE;
|
||||
|
||||
// Process new movement with reconciled state
|
||||
PlayerState statePayload = ProcessMovement(clientInputBuffer[bufferIndex]);
|
||||
|
||||
// Update buffer with recalculated state
|
||||
stateBuffer[bufferIndex] = statePayload;
|
||||
|
||||
tickToProcess++;
|
||||
}
|
||||
}else{
|
||||
// Debug.Log($"Reconciliation cancelled\n, Errors\npos:{positionError}, rot:{rotationError}");
|
||||
}
|
||||
}
|
||||
|
||||
public void m_OnServerMovementState(PlayerState serverState)
|
||||
{
|
||||
latestServerState = serverState;
|
||||
}
|
||||
|
||||
public void OnServerMovementState(PlayerState serverState){
|
||||
if(isServer){
|
||||
RpcOnServerMovementState(serverState);
|
||||
}else{
|
||||
m_OnServerMovementState(serverState);
|
||||
// CmdOnServerMovementState(serverState);
|
||||
}
|
||||
}
|
||||
|
||||
[ClientRpc]
|
||||
public void RpcOnServerMovementState(PlayerState serverState){
|
||||
m_OnServerMovementState(serverState);
|
||||
// Debug.Log(serverState.Position + ":" + transform.position);
|
||||
|
||||
}
|
||||
|
||||
IEnumerator SendToServer(InputState inputPayload)
|
||||
{
|
||||
yield return new WaitForSeconds(0.02f);
|
||||
|
||||
OnClientInput(inputPayload);
|
||||
}
|
||||
|
||||
PlayerState ProcessMovement(InputState input)
|
||||
{
|
||||
// Should always be in sync with same function on Client
|
||||
body.Translate(new Vector3(0, speed), body);
|
||||
Turn(input.Input);
|
||||
|
||||
return new PlayerState()
|
||||
{
|
||||
Tick = input.Tick,
|
||||
Position = transform.position,
|
||||
Rotation = transform.rotation
|
||||
};
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
void CheckForPickups(){
|
||||
Collider2D[] hits = Physics2D.OverlapCircleAll(transform.position, 3, pickupsLayer);
|
||||
foreach(Collider2D hit in hits){
|
||||
@@ -505,60 +638,12 @@ public class SpaceshipController : NetworkBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
void HandleInput(Vector2 _input){
|
||||
// transform.Translate(transform.forward * _input.y);
|
||||
// transform.Rotate(transform.up * _input.x);
|
||||
body.Translate(new Vector3(0, speed), body);
|
||||
Turn(_input);
|
||||
}
|
||||
|
||||
void UpdateStates(int tick,double rtt,Vector2 m_input, Vector3 m_position, Quaternion m_rotation){
|
||||
|
||||
if(isServer){
|
||||
m_updateInput(tick,rtt,m_input, m_position, m_rotation);
|
||||
}else{
|
||||
CmdUpdateInput(tick,rtt,m_input, m_position, m_rotation);
|
||||
}
|
||||
}
|
||||
|
||||
[Command]
|
||||
void CmdUpdateInput(int tick,double rtt, Vector2 m_input, Vector3 m_position, Quaternion m_rotation){
|
||||
m_updateInput(tick,rtt,m_input, m_position, m_rotation);
|
||||
}
|
||||
|
||||
private void m_updateInput(int tick,double rtt, Vector2 m_input, Vector3 m_position, Quaternion m_rotation){
|
||||
clientNetworkRTT = rtt;
|
||||
m_Input = m_input;
|
||||
clientInputBuffer[bufferIndex] = new InputState(){Tick=tick, Input=m_input};
|
||||
clientStateBuffer[bufferIndex] = new PlayerState(){Tick=tick, Position=m_position, Rotation=m_rotation};
|
||||
}
|
||||
[ClientRpc]
|
||||
void RpcRubberband(Vector3 m_position, Quaternion m_rotation){
|
||||
return;
|
||||
if(!CUSTOM_NET_TRANSFORM){return;}
|
||||
PlayerState serverState = new PlayerState(){Tick=0, Position = m_position, Rotation = m_rotation};
|
||||
PlayerState clientState = new PlayerState(){Tick=0, Position = transform.position, Rotation = transform.rotation};
|
||||
float diff = serverState.Difference(clientState);
|
||||
Debug.Log("Rubber banded, Strength -> " + diff);
|
||||
if(diff < 0.3f){
|
||||
transform.position = Vector3.Lerp(transform.position, m_position, rubberbandSmoothness);
|
||||
// transform.rotation = Quaternion.Lerp(transform.rotation, m_rotation,rubberbandSmoothness);
|
||||
transform.rotation = m_rotation;
|
||||
return;
|
||||
}
|
||||
transform.position = m_position;
|
||||
transform.rotation = m_rotation;
|
||||
RubberBandsCount++;
|
||||
}
|
||||
|
||||
PlayerState targetState;
|
||||
[ClientRpc]
|
||||
void RpcUpdateOnClient(Vector3 m_position, Quaternion m_rotation, Vector2 _input){
|
||||
if(isLocalPlayer){
|
||||
// return;
|
||||
}
|
||||
targetState = new PlayerState(){Position = m_position, Rotation = m_rotation};
|
||||
}
|
||||
// void HandleInput(Vector2 _input){
|
||||
// // transform.Translate(transform.forward * _input.y);
|
||||
// // transform.Rotate(transform.up * _input.x);
|
||||
// body.Translate(new Vector3(0, speed), body);
|
||||
// Turn(_input);
|
||||
// }
|
||||
|
||||
void Turn(Vector2 input)
|
||||
{
|
||||
@@ -578,31 +663,6 @@ public class SpaceshipController : NetworkBehaviour
|
||||
//trailMgr.trail.SetPositions(positions);
|
||||
}
|
||||
|
||||
void OnGUI()
|
||||
{
|
||||
if (!isLocalPlayer) { return; }
|
||||
if (showDebugHUD)
|
||||
{
|
||||
Vector3 bodyOnScreen = Camera.main.WorldToScreenPoint(body.position);
|
||||
// Vector3 DetourOnScreen = Camera.main.WorldToScreenPoint(body.position + Detour);
|
||||
Vector3 bodyUpOnScreen = Camera.main.WorldToScreenPoint(body.position + body.up);
|
||||
Vector3 bodyRightOnScreen = Camera.main.WorldToScreenPoint(body.position + body.right);
|
||||
|
||||
|
||||
// GUI.Label(new Rect(DetourOnScreen.x,DetourOnScreen.y, 100, 20), Detour.ToString());
|
||||
// GUI.Label(new Rect(bodyUpOnScreen.x,bodyUpOnScreen.y, 100, 20), body.up.ToString());
|
||||
// GUI.Label(new Rect(bodyRightOnScreen.x, bodyRightOnScreen.y, 100, 20), body.right.ToString());
|
||||
|
||||
|
||||
GUI.Label(new Rect(Screen.width - 120, 10, 100, 20), transform.position.ToString());
|
||||
GUI.Label(new Rect(Screen.width - 120, 30, 100, 20), timeInMillis.ToString());
|
||||
GUI.Label(new Rect(Screen.width - 100, Screen.height - 30, 50, 20), (NetworkTime.rtt * 1000).ToString() + " ms");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public float Angle(Vector2 vector2)
|
||||
{
|
||||
return 360 - (Mathf.Atan2(vector2.x, vector2.y) * Mathf.Rad2Deg * Mathf.Sign(vector2.x));
|
||||
@@ -963,22 +1023,4 @@ public class SpaceshipController : NetworkBehaviour
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public class StatePayload
|
||||
{
|
||||
public int Time;
|
||||
public Vector3 Position;
|
||||
public Quaternion Rotation;
|
||||
public Vector2 Input;
|
||||
|
||||
public StatePayload(int time, Vector3 position, Quaternion rotation, Vector2 input)
|
||||
{
|
||||
Time = time;
|
||||
Position = position;
|
||||
Rotation = rotation;
|
||||
Input = input;
|
||||
}
|
||||
}
|
||||
@@ -76,15 +76,15 @@ public struct PlayerState{
|
||||
return $"tick: {Tick},pos: {Position}, rot: {Rotation}";
|
||||
}
|
||||
|
||||
public override bool Equals(object obj)
|
||||
{
|
||||
PlayerState _obj = (PlayerState) obj;
|
||||
if(_obj.Position == Position && _obj.Rotation == Rotation){
|
||||
return true;
|
||||
}
|
||||
// public override bool Equals(object obj)
|
||||
// {
|
||||
// PlayerState _obj = (PlayerState) obj;
|
||||
// if(_obj.Position == Position && _obj.Rotation == Rotation){
|
||||
// return true;
|
||||
// }
|
||||
|
||||
return false;
|
||||
}
|
||||
// return false;
|
||||
// }
|
||||
|
||||
public bool CloseEnough(PlayerState other, float threshold) => Mathf.Abs((other.Position-Position).magnitude) < threshold && Rotation.Approximately(other.Rotation, threshold);
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using TMPro;
|
||||
using Debug = CustomLogger.Debug;
|
||||
using System;
|
||||
|
||||
public class TradingPost : MonoBehaviour
|
||||
{
|
||||
@@ -29,8 +30,12 @@ public class TradingPost : MonoBehaviour
|
||||
}
|
||||
checkTradePostBug(stackTrace);
|
||||
gameObject.SetActive(true);
|
||||
Refresh();
|
||||
|
||||
try{
|
||||
Refresh();
|
||||
}catch(Exception e){
|
||||
Feedbacks.Send("Trading Post Error", e.Message, e.StackTrace, e.Source);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -48,7 +53,35 @@ public class TradingPost : MonoBehaviour
|
||||
|
||||
int metalCount = 10;
|
||||
public int goldCount => goldPerMetal * metalCount /10;
|
||||
public int goldPerMetal => (int)(float.Parse(building.buildingData.levels[building.curLevel].stats[0].value) * 10);
|
||||
// public int goldPerMetal => (int)(float.Parse(building.buildingData.levels[building.curLevel].stats[0].value) * 10);
|
||||
public int goldPerMetal {
|
||||
get{
|
||||
string _rate =building.buildingData.levels[building.curLevel].stats[0].value;
|
||||
Debug.Log(_rate);
|
||||
|
||||
float rate = 0.2f;
|
||||
if(_rate.Contains("0.1")){
|
||||
rate = 0.1f;
|
||||
}else if(_rate.Contains("0.2")){
|
||||
rate = 0.2f;
|
||||
}else if(_rate.Contains("0.3")){
|
||||
rate = 0.3f;
|
||||
}else if(_rate.Contains("0.4")){
|
||||
rate = 0.4f;
|
||||
}else if(_rate.Contains("0.5")){
|
||||
rate = 0.5f;
|
||||
}else{
|
||||
Feedbacks.Send("Trading Post Error", "String: " + _rate,building.ToString(), Debug.loggedText);
|
||||
}
|
||||
|
||||
// try{
|
||||
// rate = float.Parse(_rate);
|
||||
// }catch(Exception e){
|
||||
// Feedbacks.Send("Trading Post Error", e.Message + " String: " + _rate, e.StackTrace, building.ToString() + "LOG\n\n" + Debug.loggedText);
|
||||
// }
|
||||
return (int)(rate * 10);
|
||||
}
|
||||
}
|
||||
|
||||
void OnGoldChanged(float value){
|
||||
Refresh();
|
||||
@@ -77,6 +110,7 @@ public class TradingPost : MonoBehaviour
|
||||
txtMetalAmount.text = "0";
|
||||
return 1;
|
||||
}
|
||||
// throw new NullReferenceException();
|
||||
tradeButton.interactable = true;
|
||||
metalSlider.interactable = true;
|
||||
warningTxt.text = "";
|
||||
|
||||
@@ -199,7 +199,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 93
|
||||
value: 203
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -256,7 +256,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 446
|
||||
value: 366
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -275,7 +275,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 123
|
||||
value: 248
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -332,7 +332,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 49
|
||||
value: 9
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -351,7 +351,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 390
|
||||
value: 524
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -820,7 +820,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 93
|
||||
value: 203
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -934,7 +934,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 446
|
||||
value: 366
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -953,7 +953,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 123
|
||||
value: 248
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1067,7 +1067,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 49
|
||||
value: 9
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1086,7 +1086,7 @@ AnimationClip:
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 390
|
||||
value: 524
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
|
||||
@@ -889,7 +889,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 75
|
||||
value: 53.998535
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -926,16 +926,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 40
|
||||
inSlope: 50.563633
|
||||
outSlope: 50.563633
|
||||
value: -91.00098
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 93
|
||||
value: 185
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1019,16 +1019,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 2
|
||||
inSlope: 3.709084
|
||||
outSlope: 3.709084
|
||||
value: -129.00098
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 123
|
||||
value: 253
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1056,7 +1056,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 53.5
|
||||
value: 32.498535
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1065,7 +1065,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 446
|
||||
value: 348
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1149,16 +1149,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 52
|
||||
inSlope: -2.4545455
|
||||
outSlope: -2.4545455
|
||||
value: 31
|
||||
inSlope: -25.363636
|
||||
outSlope: -25.363636
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 49
|
||||
value: 7
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -1186,16 +1186,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 9
|
||||
inSlope: 18.981812
|
||||
outSlope: 18.981812
|
||||
value: -122
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 390
|
||||
value: 512
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2756,7 +2756,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 75
|
||||
value: 53.998535
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2793,16 +2793,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 40
|
||||
inSlope: 50.563633
|
||||
outSlope: 50.563633
|
||||
value: -91.00098
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 93
|
||||
value: 185
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2886,16 +2886,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 2
|
||||
inSlope: 3.709084
|
||||
outSlope: 3.709084
|
||||
value: -129.00098
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 123
|
||||
value: 253
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2923,7 +2923,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 53.5
|
||||
value: 32.498535
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -2932,7 +2932,7 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 446
|
||||
value: 348
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -3127,16 +3127,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 52
|
||||
inSlope: -2.4545455
|
||||
outSlope: -2.4545455
|
||||
value: 31
|
||||
inSlope: -25.363636
|
||||
outSlope: -25.363636
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 49
|
||||
value: 7
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
@@ -3164,16 +3164,16 @@ AnimationClip:
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.3666667
|
||||
value: 9
|
||||
inSlope: 18.981812
|
||||
outSlope: 18.981812
|
||||
value: -122
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1.8333334
|
||||
value: 390
|
||||
value: 512
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 136
|
||||
|
||||
Reference in New Issue
Block a user