woso_javan 3 viikkoa sitten
vanhempi
commit
cfe41899d0

+ 15 - 15
assets/module_aliens/Prefabs/Levels/level_2.prefab

@@ -307,9 +307,9 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 1.1505377561859405,
-      "y": 1.0648767028774273,
-      "z": -4.5059289424127655
+      "x": 0.896,
+      "y": 1.165,
+      "z": -4.191
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -738,9 +738,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 1.031,
-      "y": 0.77,
-      "z": -4.073
+      "x": 0.665,
+      "y": 0.923,
+      "z": -3.636
     }
   },
   {
@@ -15179,7 +15179,7 @@
       "__type__": "cc.Quat",
       "x": -0.3381020724773407,
       "y": -0.15928983688354492,
-      "z": 0.05817444995045662,
+      "z": 0.05817445367574692,
       "w": 0.925704836845398
     }
   },
@@ -15208,9 +15208,9 @@
     ],
     "value": {
       "__type__": "cc.Vec3",
-      "x": 0.000011986755453108344,
-      "y": 0.09503044401503757,
-      "z": -0.007085567248338975
+      "x": 0.000011987401194346603,
+      "y": 0.09503044399878036,
+      "z": -0.007085567335309406
     }
   },
   {
@@ -18176,7 +18176,7 @@
     ],
     "value": {
       "__type__": "cc.Quat",
-      "x": 0.027973895892500877,
+      "x": 0.027973894029855728,
       "y": 0,
       "z": 0,
       "w": 0.9996086359024048
@@ -18208,8 +18208,8 @@
     "value": {
       "__type__": "cc.Vec3",
       "x": 0.00012207031244315658,
-      "y": 0.09484815602013441,
-      "z": -0.007028267304427516
+      "y": 0.09484815604639607,
+      "z": -0.007028266950683815
     }
   },
   {
@@ -20115,9 +20115,9 @@
     "value": {
       "__type__": "cc.Quat",
       "x": 0,
-      "y": 1.9361997205535886e-7,
+      "y": 1.5147312282248748e-7,
       "z": 0,
-      "w": 0.9999999407388839
+      "w": 0.9999999828857317
     }
   },
   {

+ 1 - 1
assets/module_aliens/Script/Model/UserModel.ts

@@ -42,9 +42,9 @@ export class UserModel {
 
     initialize() {
        this.money = 0;
-       this.powerCurrent = 1;
        this.powerRecoverTime = this.getPramById(5);
        this.powerMax = this.getPramById(4);
+       this.powerCurrent = this.powerMax;
        this.radarFreeCount = this.getPramById(3);
        this.freeScreenShotCount = this.getPramById(2);
        this.powerAddByAd = this.getPramById(6);

+ 1 - 1
assets/module_basic/config/main_config.json

@@ -1 +1 @@
-{"1":{"param":1,"content":"强制弹窗广告间隔游玩次数"},"2":{"param":1,"content":"新玩家 情报 道具赠送数量"},"3":{"param":1,"content":"新玩家 探测 道具赠送数量"},"4":{"param":3,"content":"体力上限"},"5":{"param":600,"content":"体力恢复1点所需时间,单位秒"},"6":{"param":1,"content":"观看广告获取体力数"},"7":{"param":100,"content":"复活增加时间数,单位秒"},"8":{"param":60,"content":"长时间未找到外星人时被嘲讽的时间间隔,单位秒"},"9":{"param":60,"content":"关卡时间剩余时间不足提示时间点,单位秒"},"10":{"param":0.2,"content":"开镜后画面放大倍率"}}
+{"1":{"param":1,"content":"强制弹窗广告间隔游玩次数"},"2":{"param":1,"content":"新玩家 情报 道具赠送数量"},"3":{"param":1,"content":"新玩家 探测 道具赠送数量"},"4":{"param":3,"content":"体力上限"},"5":{"param":600,"content":"体力恢复1点所需时间,单位秒"},"6":{"param":1,"content":"观看广告获取体力数"},"7":{"param":100,"content":"复活增加时间数,单位秒"},"8":{"param":60,"content":"长时间未找到外星人时被嘲讽的时间间隔,单位秒"},"9":{"param":60,"content":"关卡时间剩余时间不足提示时间点,单位秒"},"10":{"param":0.14,"content":"开镜后画面放大倍率"}}

BIN
excel/main_config.xlsx


+ 1 - 1
profiles/v2/packages/preview.json

@@ -5,7 +5,7 @@
   },
   "preview": {
     "current": {
-      "platform": "gameView"
+      "platform": "browser"
     }
   }
 }

+ 75 - 75
profiles/v2/packages/scene.json

@@ -37,31 +37,6 @@
     "snapThreshold": 4
   },
   "camera-infos": {
-    "10ae2378-2308-4fba-99fb-0bd7f7337919": {
-      "position": {
-        "x": 521,
-        "y": 421,
-        "z": 5000
-      },
-      "rotation": {
-        "x": 0,
-        "y": 0,
-        "z": 0,
-        "w": 1
-      },
-      "viewCenter": {
-        "x": 0,
-        "y": 0,
-        "z": 0
-      },
-      "contentRect": {
-        "x": 0,
-        "y": 0,
-        "width": 1029.624703087886,
-        "height": 832
-      },
-      "scale": 0.98812351543943
-    },
     "3ceab7b7-79c8-4d89-b600-ead250126e6f": {
       "position": {
         "x": -3.5264452644526614,
@@ -1162,31 +1137,6 @@
       },
       "scale": 1
     },
-    "29dc5799-9f85-4365-b308-d63b7f8c6727": {
-      "position": {
-        "x": 381.15053775618594,
-        "y": 801.0648767028774,
-        "z": -6.149928942412766
-      },
-      "rotation": {
-        "x": -0.11425697264200455,
-        "y": -0.33049795426755396,
-        "z": -0.04034385733460195,
-        "w": 0.9359961643099887
-      },
-      "viewCenter": {
-        "x": 383.185289969674,
-        "y": 800.2617690378063,
-        "z": -8.67198497029585
-      },
-      "contentRect": {
-        "x": -466.0053996518279,
-        "y": -178.45927338531948,
-        "width": 1205,
-        "height": 603
-      },
-      "scale": 0.5946035575013605
-    },
     "773de0b0-468b-4fbb-965c-36c47d7a4c94": {
       "position": {
         "x": 392.48145842490914,
@@ -1212,17 +1162,17 @@
       },
       "scale": 1
     },
-    "19323c5d-5d36-438a-86ee-8288c690e5b0": {
+    "9e293cde-e27b-4902-808b-e884f3e9da32": {
       "position": {
-        "x": 33.86077932611771,
-        "y": 33.8607793261177,
-        "z": 33.8607793261177
+        "x": 18.695477141176585,
+        "y": 18.695477141176582,
+        "z": 18.69547714117658
       },
       "rotation": {
-        "x": -0.27984814233312133,
-        "y": 0.3647051996310009,
-        "z": 0.11591689595929512,
-        "w": 0.8804762392171493
+        "x": 0,
+        "y": 0,
+        "z": 0,
+        "w": 1
       },
       "viewCenter": {
         "x": 0,
@@ -1237,11 +1187,11 @@
       },
       "scale": 1
     },
-    "9e293cde-e27b-4902-808b-e884f3e9da32": {
+    "be14c61f-22d8-4bb9-b444-ad9f29740469": {
       "position": {
-        "x": 18.695477141176585,
-        "y": 18.695477141176582,
-        "z": 18.69547714117658
+        "x": 401.5,
+        "y": 401.5,
+        "z": 5000
       },
       "rotation": {
         "x": 0,
@@ -1262,34 +1212,83 @@
       },
       "scale": 1
     },
-    "be14c61f-22d8-4bb9-b444-ad9f29740469": {
+    "19323c5d-5d36-438a-86ee-8288c690e5b0": {
       "position": {
-        "x": 401.5,
-        "y": 401.5,
-        "z": 5000
+        "x": 17.852290768081694,
+        "y": 17.852290768081687,
+        "z": 17.852290768081687
       },
       "rotation": {
+        "x": -0.27984814233312133,
+        "y": 0.3647051996310009,
+        "z": 0.11591689595929512,
+        "w": 0.8804762392171493
+      },
+      "viewCenter": {
         "x": 0,
         "y": 0,
-        "z": 0,
-        "w": 1
+        "z": 0
+      },
+      "contentRect": {
+        "x": 0,
+        "y": 0,
+        "width": 803,
+        "height": 803
+      },
+      "scale": 1
+    },
+    "29dc5799-9f85-4365-b308-d63b7f8c6727": {
+      "position": {
+        "x": 380.4249464750022,
+        "y": 803.3922813066284,
+        "z": -0.5948896166688986
+      },
+      "rotation": {
+        "x": -0.17512822310054424,
+        "y": -0.16647102406885073,
+        "z": -0.030056396089774465,
+        "w": 0.9699041788031054
       },
       "viewCenter": {
+        "x": 383.3054528966616,
+        "y": 800.1675851986711,
+        "z": -8.738965837554339
+      },
+      "contentRect": {
         "x": 0,
         "y": 0,
-        "z": 0
+        "width": 803,
+        "height": 803
+      },
+      "scale": 1
+    },
+    "55742b3c-e667-4650-8011-efdabf3e5d1b": {
+      "position": {
+        "x": 382.67396223381724,
+        "y": 799.4015569715692,
+        "z": -5.671431110339842
+      },
+      "rotation": {
+        "x": -0.17061776244251334,
+        "y": -0.22069358924264196,
+        "z": -0.03924077286650519,
+        "w": 0.9595019961162923
+      },
+      "viewCenter": {
+        "x": 383.1471410492118,
+        "y": 799.0038162652921,
+        "z": -6.645622760672939
       },
       "contentRect": {
         "x": 0,
         "y": 0,
-        "width": 363,
-        "height": 767
+        "width": 803,
+        "height": 803
       },
       "scale": 1
     }
   },
   "camera-uuids": [
-    "10ae2378-2308-4fba-99fb-0bd7f7337919",
     "3ceab7b7-79c8-4d89-b600-ead250126e6f",
     "0c921f09-b549-4938-abce-803aeb9c5b23",
     "e4c45131-d908-436b-9546-65eda34be3e1",
@@ -1334,11 +1333,12 @@
     "97847f67-f841-48ad-a6b2-6ac8db2fcbfd",
     "d6678b55-2635-45df-bdce-51e04632740e",
     "7d719727-ff7f-4ee8-81ed-4ee61f407f45",
-    "29dc5799-9f85-4365-b308-d63b7f8c6727",
     "773de0b0-468b-4fbb-965c-36c47d7a4c94",
-    "19323c5d-5d36-438a-86ee-8288c690e5b0",
     "9e293cde-e27b-4902-808b-e884f3e9da32",
-    "be14c61f-22d8-4bb9-b444-ad9f29740469"
+    "be14c61f-22d8-4bb9-b444-ad9f29740469",
+    "19323c5d-5d36-438a-86ee-8288c690e5b0",
+    "29dc5799-9f85-4365-b308-d63b7f8c6727",
+    "55742b3c-e667-4650-8011-efdabf3e5d1b"
   ],
   "camera": {
     "color": [