Mixed stuff

-force respawn after 15 sec. -show sponsor name + link icon instead of url -updating dummy prefabs -fixing cursor appearing in Background -show gun name properly
sputn1ck · May 27, 2020 · e6a669f · e6a669f
1 parent ca5ebd5
commit e6a669f
Show file tree

Hide file tree

Showing 11 changed files with 1,072 additions and 966 deletions.
diff --git a/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.asset b/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.asset
@@ -82,6 +82,12 @@ MonoBehaviour:
     m_Scale: 1
     m_Name: info
     m_HashCode: 3874478
+  - m_ElementType: 2
+    m_Unicode: 0
+    m_GlyphIndex: 5
+    m_Scale: 1
+    m_Name: link
+    m_HashCode: 3770304
   m_SpriteGlyphTable:
   - m_Index: 0
     m_Metrics:
@@ -163,6 +169,22 @@ MonoBehaviour:
     m_AtlasIndex: 0
     sprite: {fileID: 8720604468809159126, guid: bd83023b664645e4ca9fac237e53e836,
       type: 3}
+  - m_Index: 5
+    m_Metrics:
+      m_Width: 128
+      m_Height: 128
+      m_HorizontalBearingX: -10
+      m_HorizontalBearingY: 124
+      m_HorizontalAdvance: 108
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 256
+      m_Width: 128
+      m_Height: 128
+    m_Scale: 0.9
+    m_AtlasIndex: 0
+    sprite: {fileID: 8720604468809159126, guid: bd83023b664645e4ca9fac237e53e836,
+      type: 3}
   spriteInfoList: []
   fallbackSpriteAssets:
   - {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
diff --git a/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.png b/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.png
diff --git a/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.png.meta b/workers/unity/Assets/BountyHunt/Art/UI/Resources/BBH Sprite Assets/Symbols.png.meta
diff --git a/workers/unity/Assets/BountyHunt/Prefabs/DummyPrefabs/0_PlayerDummies.prefab b/workers/unity/Assets/BountyHunt/Prefabs/DummyPrefabs/0_PlayerDummies.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 1771615028126529570}
   - component: {fileID: 8884591860163670217}
   - component: {fileID: 5732215415702532855}
-  - component: {fileID: 6082691775500474893}
   - component: {fileID: 1449321898093342440}
   m_Layer: 0
   m_Name: 0_PlayerDummies
@@ -89,19 +88,6 @@ MonoBehaviour:
   returnPayment: 0
   expiryInSeconds: 300
   triggerPaymentTest: 0
---- !u!114 &6082691775500474893
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 289981644747327406}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 942e16097c8e1f649960090268d45b23, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  AuctionEntyState: 0
 --- !u!114 &1449321898093342440
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -115,6 +101,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   bufferBalance: 0
-  channelMissingBalance: 0
+  channelMissingBalance: 2000
   daemonBalance: 30000
   randomBalance: 0
diff --git a/workers/unity/Assets/BountyHunt/Prefabs/DummyPrefabs/1_ServerDummies.prefab b/workers/unity/Assets/BountyHunt/Prefabs/DummyPrefabs/1_ServerDummies.prefab
@@ -12,7 +12,6 @@ GameObject:
   - component: {fileID: 212973259964900785}
   - component: {fileID: 851089427456680485}
   - component: {fileID: 1505973134812988758}
-  - component: {fileID: 4259521829153023365}
   m_Layer: 0
   m_Name: 1_ServerDummies
   m_TagString: Untagged
@@ -59,9 +58,48 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 711b27c51ec22ba49905b6bb887664b5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bbhDuration: 30
+  ssDuration: 120
   lobbyDuration: 10
+  bbDuration: 120
+  subsidy: 10000
+  bountyDropOnDeath: 1
+  bountyConversion: 0.1
+  bountyConversionTimeSeconds: 10
   PlayerSkins: []
+  invokeKick: 0
+  nameKick: 
+  pubkeyKick: 
+  sender: 
+  message: 
+  announce: 0
+  messageTrigger: 0
+  testAdvertisers:
+  - Name: Nyan
+    Investment: 1000
+    SquareTextureLinks:
+    - https://en.wikipedia.org/wiki/Nyan_Cat#/media/File:Nyan_cat_250px_frame.PNG
+    - https://cdn.kapwing.com/final_5cacd20e01f93c0014190e5a_347921.mp4
+    Url: https://www.youtube.com/watch?v=QH2-TGUlwu4
+  - Name: Grumpy
+    Investment: 200
+    SquareTextureLinks:
+    - https://pbs.twimg.com/profile_images/1080545769034108928/CEzHCTpI_400x400.jpg
+    Url: https://www.instagram.com/realgrumpycat/?hl=en
+  - Name: Catface
+    Investment: 200
+    SquareTextureLinks:
+    - https://static.tvtropes.org/pmwiki/pub/images/cat_face.jpg
+    Url: http://weebls-stuff.com/toons/category/toons/cat-face/
+  - Name: smudge
+    Investment: 300
+    SquareTextureLinks:
+    - https://i.pinimg.com/originals/f8/27/ed/f827ed9a704146f65b96226f430abf3c.png
+    Url: https://i.pinimg.com/originals/f8/27/ed/f827ed9a704146f65b96226f430abf3c.png
+  - Name: polite cat
+    Investment: 400
+    SquareTextureLinks:
+    - https://i1.sndcdn.com/avatars-000492537201-4u9jnl-t500x500.jpg
+    Url: https://pawsplanet.me/meet-ollie-the-polite-cat-with-the-amazing-expression/
 --- !u!114 &1505973134812988758
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -81,9 +119,13 @@ MonoBehaviour:
   earningsRange: {x: 10, y: 10000}
   killsRange: {x: 3, y: 200}
   deathsRange: {x: 3, y: 200}
+  gameDonationSqrtRange: {x: 0, y: 0}
+  devsDonationSqrtRange: {x: 0, y: 0}
   playerEarnings: 5000
   playerKills: 201
   playerDeaths: 2
+  playerDonationsGame: 0
+  playerDonationsDevs: 0
   GoldThreshold: 0.1
   SilverThreshold: 0.3
   BronzeThreshold: 0.6
@@ -97,15 +139,3 @@ MonoBehaviour:
   returnPayment: 0
   expiryInSeconds: 0
   triggerPaymentTest: 0
---- !u!114 &4259521829153023365
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 302241656598969916}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5ccd12d5946c9747b52e6a79c8a5741, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
diff --git a/workers/unity/Assets/BountyHunt/Prefabs/UI Prefabs/RespawnScreen.prefab b/workers/unity/Assets/BountyHunt/Prefabs/UI Prefabs/RespawnScreen.prefab
@@ -29,9 +29,9 @@ RectTransform:
   m_GameObject: {fileID: 667827042438864441}
   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_LocalScale: {x: 1.0000305, y: 1.0000305, z: 1.0000305}
   m_Children: []
-  m_Father: {fileID: 746235203577518675}
+  m_Father: {fileID: 747275167077876847}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -60,7 +60,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 0.8455281, b: 0, a: 1}
   m_RaycastTarget: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
@@ -165,15 +165,13 @@ RectTransform:
   m_Children:
   - {fileID: 3208367383824945123}
   - {fileID: 6308476965989881846}
-  - {fileID: 2742793126243962607}
-  - {fileID: 2242620388957293233}
   m_Father: {fileID: 747275167077876847}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 1600}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &744268752647899649
 CanvasRenderer:
@@ -197,7 +195,7 @@ GameObject:
   - component: {fileID: 637472717674802737}
   - component: {fileID: 1669886717187300436}
   m_Layer: 5
-  m_Name: Overlay
+  m_Name: topElements
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -214,11 +212,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.0000306, y: 1.0000306, z: 1.0000306}
   m_Children:
-  - {fileID: 747045361435735517}
   - {fileID: 2187351544255593289}
   - {fileID: 6077156489467316389}
   m_Father: {fileID: 747275167077876847}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -350,16 +347,18 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 747045361435735517}
   - {fileID: 746235203577518675}
   - {fileID: 747141627479720271}
+  - {fileID: 2742793126243962607}
   - {fileID: 747061283668224307}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 2300, y: 1600}
+  m_SizeDelta: {x: 2300, y: 1400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3635047593570995405
 MonoBehaviour:
@@ -431,7 +430,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 747275167077876847}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -514,11 +513,11 @@ RectTransform:
   - {fileID: 876434519034931795}
   - {fileID: 8234444414703655402}
   m_Father: {fileID: 746235203577518675}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 376}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -360}
   m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4809689134168564799
@@ -579,11 +578,11 @@ RectTransform:
   - {fileID: 7562012013367633289}
   - {fileID: 3847347434881093483}
   m_Father: {fileID: 746235203577518675}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 690}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -80}
   m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8892755074244074045
@@ -660,7 +659,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -830}
+  m_AnchoredPosition: {x: 0, y: -850}
   m_SizeDelta: {x: 1000, y: 87.19995}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5958243046415931887
@@ -1002,14 +1001,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8379230626069997274}
-  m_Father: {fileID: 747141627479720271}
-  m_RootOrder: 3
+  m_Father: {fileID: 2742793126243962607}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -1442.4}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 260, y: 87.19995}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4472056488842790553
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2364,7 +2363,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 747141627479720271}
+    m_TransformParent: {fileID: 747275167077876847}
     m_Modifications:
     - target: {fileID: 7419387830387518578, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
@@ -2389,17 +2388,17 @@ PrefabInstance:
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
@@ -2409,7 +2408,7 @@ PrefabInstance:
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
@@ -2434,7 +2433,7 @@ PrefabInstance:
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 200
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 794089841966155819, guid: c124bd25e6a15844788ead8d7548ac51,
         type: 3}