LEvel balancing and bug fixes

- Fixed a bug where swapping toyos would leave the old toyo model there
- Raised player toyo levels

ToyoWorld/Assets/BattleArea.cs

@@ -21,14 +21,15 @@ void Update()
 
     private void OnTriggerEnter(Collider other)
     {
+        /*
         float isBattle = Random.Range(0f, 100f);
 
-        if (isBattle > 66f)
+        if (isBattle > 80f)
         {
 
             Debug.Log("battle triggered");
             controller.CallBattleStartMethod();
-        }
+        }*/
     }
 
     private void OnTriggerStay(Collider other)

ToyoWorld/Assets/Game/Resources/Atack VFX/Claw/Dark Claw.prefab

@@ -24437,7 +24437,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8087117292999587842}
-  m_LocalRotation: {x: -0, y: -0, z: -0.23208752, w: 0.97269493}
+  m_LocalRotation: {x: 0.3952979, y: 0.13189255, z: -0.05746904, w: 0.90721625}
   m_LocalPosition: {x: 0, y: 23.554, z: 0.91}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

ToyoWorld/Assets/Game/Resources/Atack VFX/Slash/Air Slash.prefab

@@ -19556,7 +19556,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6353739613531823181}
-  m_LocalRotation: {x: -0.2227184, y: -0.24381913, z: -0.05763798, w: 0.9421394}
+  m_LocalRotation: {x: -0.12013184, y: 0.13592587, z: 0.016606888, w: 0.9832684}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

ToyoWorld/Assets/Game/Resources/Atack VFX/Slash/Fire Slash.prefab

@@ -19553,7 +19553,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7898358583556127077}
-  m_LocalRotation: {x: -0.2227184, y: -0.24381913, z: -0.05763798, w: 0.9421394}
+  m_LocalRotation: {x: -0.12013184, y: 0.13592587, z: 0.016606888, w: 0.9832684}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

ToyoWorld/Assets/NewPlayer.prefab

@@ -3321,11 +3321,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   toyoParty:
   - _base: {fileID: 11400000, guid: 367b69783d687164c8b3bd6e73c75f0d, type: 2}
-    level: 3
+    level: 15
   - _base: {fileID: 11400000, guid: d31c6f72ff87779479154004af0c3be8, type: 2}
-    level: 4
+    level: 17
   - _base: {fileID: 11400000, guid: 66a117fce3f63c44aa83ceac320559b0, type: 2}
-    level: 6
+    level: 18
 --- !u!114 &6693271465997393536
 MonoBehaviour:
   m_ObjectHideFlags: 0

ToyoWorld/Assets/Resources/Windows/LoginWindow.prefab

@@ -203,7 +203,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: af79c2a93a77b3949aa26b84a203c17a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e6c3b1b231aabe94f91dc7644714ffde, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1012,7 +1012,7 @@ MonoBehaviour:
   showEventFoldout: 0
   showBetaFoldout: 0
   info:
-  - pos: {x: -106.875, y: 20.811798, z: 0}
+  - pos: {x: -114.609375, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1052,7 +1052,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: -80.859375, y: 20.811798, z: 0}
+  - pos: {x: -87.890625, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1092,7 +1092,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: -58.359375, y: 20.811798, z: 0}
+  - pos: {x: -63.28125, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1132,7 +1132,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: -29.53125, y: 20.811798, z: 0}
+  - pos: {x: -34.453125, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1172,7 +1172,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: -4.21875, y: 20.811798, z: 0}
+  - pos: {x: -8.4375, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1212,7 +1212,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: 5.625, y: 20.811798, z: 0}
+  - pos: {x: 4.21875, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1252,7 +1252,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: 35.859375, y: 20.811798, z: 0}
+  - pos: {x: 37.265625, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1292,7 +1292,7 @@ MonoBehaviour:
     chSize: 64
     submeshChange: 0
     invoked: 1
-  - pos: {x: 68.203125, y: 20.811798, z: 0}
+  - pos: {x: 71.71875, y: 20.811798, z: 0}
     offset: {x: 0, y: 0, z: 0}
     lineSpacing: 1
     isEndOfParagraph: 0
@@ -1338,7 +1338,7 @@ MonoBehaviour:
   _text: <c=rainbow><w>PLAY NOW
   drawText: PLAY NOW
   hyphenedText: PLAY NOW
-  font: {fileID: 12800000, guid: 92af8c94974284c4388316b4f89b4f02, type: 2}
+  font: {fileID: 12800000, guid: e110c919ea5e84fea8cbc2f0556ecfef, type: 3}
   _color32:
     serializedVersion: 2
     rgba: 4294967295
@@ -1389,23 +1389,23 @@ MonoBehaviour:
   textMesh: {fileID: 0}
   rawTopLeftBounds: {x: 202.81287, y: -65.8118, z: 0}
   rawBottomRightBounds: {x: -202.81287, y: 65.8118, z: 0}
-  rawBottomRightTextBounds: {x: 213.75, y: -45, z: 0}
+  rawBottomRightTextBounds: {x: 229.21875, y: -45, z: 0}
   topLeftBounds: {x: 757.18713, y: 833.4502, z: 0}
   topRightBounds: {x: 1162.8129, y: 833.4502, z: 0}
   bottomLeftBounds: {x: 757.18713, y: 701.8266, z: 0}
   bottomRightBounds: {x: 1162.8129, y: 701.8266, z: 0}
   centerBounds: {x: 960, y: 767.6384, z: 0}
-  topLeftTextBounds: {x: 853.125, y: 790.1384, z: 0}
-  topRightTextBounds: {x: 1066.875, y: 790.1384, z: 0}
-  bottomLeftTextBounds: {x: 853.125, y: 745.1384, z: 0}
-  bottomRightTextBounds: {x: 1066.875, y: 745.1384, z: 0}
+  topLeftTextBounds: {x: 845.3906, y: 790.1384, z: 0}
+  topRightTextBounds: {x: 1074.6094, y: 790.1384, z: 0}
+  bottomLeftTextBounds: {x: 845.3906, y: 745.1384, z: 0}
+  bottomRightTextBounds: {x: 1074.6094, y: 745.1384, z: 0}
   centerTextBounds: {x: 960, y: 767.6384, z: 0}
-  finalTopLeftTextBounds: {x: 853.125, y: 790.1384, z: 0}
-  finalTopRightTextBounds: {x: 1066.875, y: 790.1384, z: 0}
-  finalBottomLeftTextBounds: {x: 853.125, y: 745.1384, z: 0}
-  finalBottomRightTextBounds: {x: 1066.875, y: 745.1384, z: 0}
+  finalTopLeftTextBounds: {x: 845.3906, y: 790.1384, z: 0}
+  finalTopRightTextBounds: {x: 1074.6094, y: 790.1384, z: 0}
+  finalBottomLeftTextBounds: {x: 845.3906, y: 745.1384, z: 0}
+  finalBottomRightTextBounds: {x: 1074.6094, y: 745.1384, z: 0}
   finalCenterTextBounds: {x: 960, y: 767.6384, z: 0}
-  unwrappedBottomRightTextBounds: {x: 213.75, y: -45, z: 0}
+  unwrappedBottomRightTextBounds: {x: 229.21875, y: -45, z: 0}
   onCompleteEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -1430,7 +1430,7 @@ MonoBehaviour:
   debugMode: 0
   totalReadTime: 0.00001
   totalUnreadTime: 0.00001
-  currentReadTime: 1.2020637
+  currentReadTime: 28.931566
   autoRead: 1
   rememberReadPosition: 1
   autoQuality: 0
@@ -2921,7 +2921,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 21300000, guid: d08f60ef09739438ca3ab0cde6f4720f, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3134,8 +3134,8 @@ MonoBehaviour:
 
 '
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e0962d31f1f084fa3ba7147d76f5b6e8, type: 2}
+  m_sharedMaterial: {fileID: 1653631458307283989, guid: e0962d31f1f084fa3ba7147d76f5b6e8, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []

ToyoWorld/Assets/SceneUIManager.cs

@@ -8,7 +8,12 @@ public class SceneUIManager : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-
+        if (GameController.instance.setName)
+        {
+            Cursor.lockState = CursorLockMode.Locked;
+            Cursor.visible = false;
+            isMouseLocked = true;
+        }
     }
 
     // Update is called once per frame

ToyoWorld/Assets/Scenes/MainBattle.unity

@@ -1065,6 +1065,7 @@ GameObject:
   - component: {fileID: 393531852}
   - component: {fileID: 393531856}
   - component: {fileID: 393531857}
+  - component: {fileID: 393531858}
   m_Layer: 8
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -1223,6 +1224,39 @@ MonoBehaviour:
   m_BeforeTransparentBundles: []
   m_BeforeStackBundles: []
   m_AfterStackBundles: []
+--- !u!114 &393531858
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 393531851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
 --- !u!1 &398799701
 GameObject:
   m_ObjectHideFlags: 0
@@ -10885,7 +10919,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: f1779a85ad2c1714a9fe1cae0f420eaa, type: 3}
   m_PlayOnAwake: 1
-  m_Volume: 0.3
+  m_Volume: 0.15
   m_Pitch: 1
   Loop: 1
   Mute: 0