薛鸿潇 5 лет назад
Родитель
Сommit
0c7217b01e

Разница между файлами не показана из-за своего большого размера
+ 166 - 186
assets/resources/game/prefab/game.prefab


+ 4 - 4
assets/resources/module/agreementTip/agreementTip.prefab

@@ -533,8 +533,8 @@
     ],
     ],
     "_srcBlendFactor": 770,
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_dstBlendFactor": 771,
-    "_string": "欢迎使用豪车大富翁,豪车大富翁非常重视您的隐私和个人信息保护。在您使用豪车大富翁之前,请认真阅读",
-    "_N$string": "欢迎使用豪车大富翁,豪车大富翁非常重视您的隐私和个人信息保护。在您使用豪车大富翁之前,请认真阅读",
+    "_string": "欢迎使用本软件,本软件非常重视您的隐私和个人信息保护。在您使用本软件之前,请认真阅读",
+    "_N$string": "欢迎使用本软件,本软件非常重视您的隐私和个人信息保护。在您使用本软件之前,请认真阅读",
     "_fontSize": 32,
     "_fontSize": 32,
     "_lineHeight": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_enableWrapText": true,
@@ -1144,8 +1144,8 @@
     ],
     ],
     "_srcBlendFactor": 770,
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_dstBlendFactor": 771,
-    "_string": "您同意并接受全部条款后方可开始使用豪车大富翁。",
-    "_N$string": "您同意并接受全部条款后方可开始使用豪车大富翁。",
+    "_string": "您同意并接受全部条款后方可开始使用本软件。",
+    "_N$string": "您同意并接受全部条款后方可开始使用本软件。",
     "_fontSize": 32,
     "_fontSize": 32,
     "_lineHeight": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_enableWrapText": true,

+ 1 - 1
assets/resources/module/reward/reward.prefab

@@ -2436,7 +2436,7 @@
     "defaultAnimation": "animation",
     "defaultAnimation": "animation",
     "_preCacheMode": 0,
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "_cacheMode": 0,
-    "loop": true,
+    "loop": false,
     "premultipliedAlpha": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "timeScale": 1,
     "_accTime": 0,
     "_accTime": 0,

+ 1 - 1
assets/resources/module/reward/rewardLuck.prefab

@@ -2436,7 +2436,7 @@
     "defaultAnimation": "animation",
     "defaultAnimation": "animation",
     "_preCacheMode": 0,
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "_cacheMode": 0,
-    "loop": true,
+    "loop": false,
     "premultipliedAlpha": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "timeScale": 1,
     "_accTime": 0,
     "_accTime": 0,

+ 1 - 1
assets/resources/module/reward/rewardMission.prefab

@@ -2433,7 +2433,7 @@
     "defaultAnimation": "animation",
     "defaultAnimation": "animation",
     "_preCacheMode": 0,
     "_preCacheMode": 0,
     "_cacheMode": 0,
     "_cacheMode": 0,
-    "loop": true,
+    "loop": false,
     "premultipliedAlpha": true,
     "premultipliedAlpha": true,
     "timeScale": 1,
     "timeScale": 1,
     "_accTime": 0,
     "_accTime": 0,

+ 9 - 9
assets/resources/module/turnable/turnable.prefab

@@ -998,15 +998,15 @@
     },
     },
     "_anchorPoint": {
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
+      "x": 0.504,
+      "y": 0.499
     },
     },
     "_trs": {
     "_trs": {
       "__type__": "TypedArray",
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "ctor": "Float64Array",
       "array": [
       "array": [
-        -2.2,
         0,
         0,
+        0.5,
         0,
         0,
         0,
         0,
         0,
         0,
@@ -1368,7 +1368,7 @@
       "__id__": 13
       "__id__": 13
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 38
         "__id__": 38
@@ -2012,7 +2012,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "6aUgIN7X5LoIPT42F1l9VD",
+    "fileId": "acmEePyxlM7YJBrafe5nC5",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2144,7 +2144,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "b47sijKeFF9bbefSetD60v",
+    "fileId": "e1jOEE1RJOP6bpfG7l0vEh",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2276,7 +2276,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "50wVGUKSRG/aVXzudnUjlG",
+    "fileId": "4dxH3vX+NLWbROTOifo1JY",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -2489,7 +2489,7 @@
     "asset": {
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
     },
-    "fileId": "d3mF2rJtFN5Ka8WBs1gWuS",
+    "fileId": "abAWkPhM1ASJM3XxvMo7W+",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -3529,7 +3529,7 @@
       "__id__": 2
       "__id__": 2
     },
     },
     "_children": [],
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
     "_components": [
       {
       {
         "__id__": 100
         "__id__": 100

+ 146 - 0
assets/resources/spine/game/changjing.atlas

@@ -0,0 +1,146 @@
+
+changjing.png
+size: 2041,1011
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+背景/changjing
+  rotate: true
+  xy: 2, 2
+  size: 750, 2037
+  orig: 750, 2037
+  offset: 0, 0
+  index: -1
+背景/shu
+  rotate: true
+  xy: 904, 754
+  size: 182, 294
+  orig: 182, 294
+  offset: 0, 0
+  index: -1
+背景/wave1
+  rotate: false
+  xy: 373, 954
+  size: 278, 55
+  orig: 300, 300
+  offset: 12, 86
+  index: -1
+背景/wave2
+  rotate: false
+  xy: 603, 851
+  size: 299, 94
+  orig: 300, 300
+  offset: 1, 51
+  index: -1
+背景/wave3
+  rotate: false
+  xy: 303, 869
+  size: 298, 83
+  orig: 300, 300
+  offset: 2, 62
+  index: -1
+背景/wave4
+  rotate: false
+  xy: 2, 877
+  size: 299, 76
+  orig: 300, 300
+  offset: 1, 69
+  index: -1
+背景/wave5
+  rotate: false
+  xy: 1548, 934
+  size: 300, 75
+  orig: 300, 300
+  offset: 0, 73
+  index: -1
+背景/wave6
+  rotate: false
+  xy: 1248, 937
+  size: 298, 72
+  orig: 300, 300
+  offset: 2, 76
+  index: -1
+背景/wave7
+  rotate: false
+  xy: 949, 938
+  size: 297, 71
+  orig: 300, 300
+  offset: 3, 79
+  index: -1
+背景/wave8
+  rotate: false
+  xy: 653, 947
+  size: 294, 62
+  orig: 300, 300
+  offset: 6, 80
+  index: -1
+背景/xie1
+  rotate: false
+  xy: 297, 955
+  size: 74, 54
+  orig: 78, 56
+  offset: 2, 1
+  index: -1
+背景/xie10
+  rotate: false
+  xy: 193, 980
+  size: 102, 29
+  orig: 108, 34
+  offset: 3, 3
+  index: -1
+背景/xie2
+  rotate: true
+  xy: 126, 986
+  size: 23, 32
+  orig: 23, 32
+  offset: 0, 0
+  index: -1
+背景/xie3
+  rotate: true
+  xy: 160, 986
+  size: 23, 31
+  orig: 23, 31
+  offset: 0, 0
+  index: -1
+背景/xie4
+  rotate: true
+  xy: 87, 994
+  size: 15, 17
+  orig: 18, 19
+  offset: 2, 1
+  index: -1
+背景/xie5
+  rotate: true
+  xy: 48, 995
+  size: 14, 17
+  orig: 17, 20
+  offset: 1, 1
+  index: -1
+背景/xie6
+  rotate: false
+  xy: 106, 994
+  size: 18, 15
+  orig: 21, 17
+  offset: 2, 1
+  index: -1
+背景/xie7
+  rotate: false
+  xy: 67, 995
+  size: 18, 14
+  orig: 21, 17
+  offset: 1, 1
+  index: -1
+背景/xie8
+  rotate: false
+  xy: 2, 1001
+  size: 21, 8
+  orig: 24, 10
+  offset: 2, 1
+  index: -1
+背景/xie9
+  rotate: false
+  xy: 25, 1001
+  size: 21, 8
+  orig: 24, 10
+  offset: 1, 1
+  index: -1

+ 5 - 0
assets/resources/spine/game/changjing.atlas.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "1.0.1",
+  "uuid": "de6d99fc-0c32-4fa7-b9ca-137eda682b31",
+  "subMetas": {}
+}

Разница между файлами не показана из-за своего большого размера
+ 441 - 0
assets/resources/spine/game/changjing.json


+ 9 - 0
assets/resources/spine/game/changjing.json.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.3",
+  "uuid": "8fbd7e3c-7aa6-4f14-8950-fad61df23914",
+  "textures": [
+    "c17a5060-6dda-4de7-843c-5fd4f3062899"
+  ],
+  "scale": 1,
+  "subMetas": {}
+}

BIN
assets/resources/spine/game/changjing.png


+ 36 - 0
assets/resources/spine/game/changjing.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c17a5060-6dda-4de7-843c-5fd4f3062899",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2041,
+  "height": 1011,
+  "platformSettings": {},
+  "subMetas": {
+    "changjing": {
+      "ver": "1.0.4",
+      "uuid": "feb1b101-5471-4867-9ff9-788d7ea47f99",
+      "rawTextureUuid": "c17a5060-6dda-4de7-843c-5fd4f3062899",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 2,
+      "trimY": 2,
+      "width": 2037,
+      "height": 1007,
+      "rawWidth": 2041,
+      "rawHeight": 1011,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
assets/resources/spine/game/pandan.json


BIN
assets/resources/spine/game/pandan.png


+ 2 - 2
assets/resources/spine/game/pandan.png.meta

@@ -18,11 +18,11 @@
       "trimType": "auto",
       "trimType": "auto",
       "trimThreshold": 1,
       "trimThreshold": 1,
       "rotated": false,
       "rotated": false,
-      "offsetX": 0.5,
+      "offsetX": 0,
       "offsetY": 0,
       "offsetY": 0,
       "trimX": 3,
       "trimX": 3,
       "trimY": 2,
       "trimY": 2,
-      "width": 1843,
+      "width": 1842,
       "height": 396,
       "height": 396,
       "rawWidth": 1848,
       "rawWidth": 1848,
       "rawHeight": 400,
       "rawHeight": 400,

BIN
assets/resources/video/Redeem.mp4


Некоторые файлы не были показаны из-за большого количества измененных файлов