提交

JisolGameCocos/assets/resources/config/json/tbgresource.json

@@ -28,5 +28,11 @@
     "name": "钥匙:锻造石副本",
     "tig": "锻造石副本的钥匙",
     "args": ""
+  },
+  {
+    "id": 90006,
+    "name": "魂:一品宠物魂",
+    "tig": "用于宠物升星",
+    "args": ""
   }
 ]

JisolGameCocos/assets/resources/config/json/tbgroleupstar.json

@@ -38,5 +38,85 @@
   {
     "grade": 10,
     "merge": 512
+  },
+  {
+    "grade": 11,
+    "merge": 1024
+  },
+  {
+    "grade": 12,
+    "merge": 2048
+  },
+  {
+    "grade": 13,
+    "merge": 4096
+  },
+  {
+    "grade": 14,
+    "merge": 8192
+  },
+  {
+    "grade": 15,
+    "merge": 16384
+  },
+  {
+    "grade": 16,
+    "merge": 32768
+  },
+  {
+    "grade": 17,
+    "merge": 65536
+  },
+  {
+    "grade": 18,
+    "merge": 131072
+  },
+  {
+    "grade": 19,
+    "merge": 262144
+  },
+  {
+    "grade": 20,
+    "merge": 524288
+  },
+  {
+    "grade": 21,
+    "merge": 1048576
+  },
+  {
+    "grade": 22,
+    "merge": 2097152
+  },
+  {
+    "grade": 23,
+    "merge": 4194304
+  },
+  {
+    "grade": 24,
+    "merge": 8388608
+  },
+  {
+    "grade": 25,
+    "merge": 16777216
+  },
+  {
+    "grade": 26,
+    "merge": 33554432
+  },
+  {
+    "grade": 27,
+    "merge": 67108864
+  },
+  {
+    "grade": 28,
+    "merge": 134217728
+  },
+  {
+    "grade": 29,
+    "merge": 268435456
+  },
+  {
+    "grade": 30,
+    "merge": 536870912
   }
 ]

JisolGameCocos/assets/resources/prefab/ui/Debugger/DebugItem.prefab

@@ -32,10 +32,13 @@
       },
       {
         "__id__": 12
+      },
+      {
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 16
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -130,8 +133,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 55.60546875,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -173,7 +176,7 @@
     "_fontSize": 20,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
-    "_overflow": 1,
+    "_overflow": 0,
     "_enableWrapText": false,
     "_font": null,
     "_isSystemFontUsed": true,
@@ -216,7 +219,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 85.60546875,
       "height": 40
     },
     "_anchorPoint": {
@@ -289,7 +292,7 @@
     },
     "clickEvents": [],
     "_interactable": true,
-    "_transition": 2,
+    "_transition": 3,
     "_normalColor": {
       "__type__": "cc.Color",
       "r": 214,
@@ -345,6 +348,44 @@
     "__type__": "cc.CompPrefabInfo",
     "fileId": "fdfZMrUD5LeJ3JUsm5gbF3"
   },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 15
+    },
+    "_resizeMode": 1,
+    "_layoutType": 1,
+    "_cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_startAxis": 0,
+    "_paddingLeft": 15,
+    "_paddingRight": 15,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
+    "_spacingX": 0,
+    "_spacingY": 0,
+    "_verticalDirection": 1,
+    "_horizontalDirection": 0,
+    "_constraint": 0,
+    "_constraintNum": 2,
+    "_affectedByScale": false,
+    "_isAlign": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "baBTXQ6nBHCZceybmU4sDK"
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -354,6 +395,7 @@
       "__id__": 0
     },
     "fileId": "82Bvk1koJK0rGlT67CNSun",
+    "instance": null,
     "targetOverrides": null
   }
 ]

JisolGameCocos/assets/resources/prefab/ui/Debugger/Debugger.prefab

@@ -942,8 +942,8 @@
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": 0,
-    "_spacingY": 0,
+    "_spacingX": 5,
+    "_spacingY": 5,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,