更换素材，增加游戏模式

HK-SHAO · Jul 26, 2022 · ce0a961 · ce0a961
1 parent 77aabe5
commit ce0a961
Show file tree

Hide file tree

Showing 29 changed files with 118 additions and 55 deletions.
diff --git a/assets/res/audio/end.mp3 b/assets/res/audio/end.mp3
diff --git a/assets/res/audio/err.mp3 b/assets/res/audio/err.mp3
diff --git a/assets/res/audio/tap.mp3 b/assets/res/audio/tap.mp3
diff --git a/assets/res/image/ball.png.meta b/assets/res/image/ball.png.meta
@@ -17,8 +17,8 @@
       "userData": {
         "wrapModeS": "mirrored-repeat",
         "wrapModeT": "mirrored-repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
+        "minfilter": "nearest",
+        "magfilter": "nearest",
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": true,

diff --git a/assets/res/image/gongji.png.meta b/assets/res/image/gongji.png.meta
@@ -15,10 +15,10 @@
       "id": "6c48a",
       "name": "texture",
       "userData": {
-        "wrapModeS": "repeat",
-        "wrapModeT": "repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
+        "wrapModeS": "mirrored-repeat",
+        "wrapModeT": "mirrored-repeat",
+        "minfilter": "nearest",
+        "magfilter": "nearest",
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": true,

diff --git a/assets/res/image/kun-sprite.png b/assets/res/image/kun-sprite.png
diff --git a/assets/res/image/kun-sprite.png.meta b/assets/res/image/kun-sprite.png.meta
@@ -70,6 +70,9 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": true,
     "hasAlpha": false,
-    "redirect": "b43569c8-9493-4355-92c1-67f3d4ba96d4@f9941"
+    "redirect": "b43569c8-9493-4355-92c1-67f3d4ba96d4@f9941",
+    "compressSettings": {
+      "useCompressTexture": false
+    }
   }
 }
diff --git a/assets/res/image/kun.png b/assets/res/image/kun.png
diff --git a/assets/res/image/kun.png.meta b/assets/res/image/kun.png.meta
@@ -17,8 +17,8 @@
       "userData": {
         "wrapModeS": "mirrored-repeat",
         "wrapModeT": "mirrored-repeat",
-        "minfilter": "linear",
-        "magfilter": "linear",
+        "minfilter": "nearest",
+        "magfilter": "nearest",
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": true,
@@ -35,7 +35,7 @@
   "userData": {
     "type": "texture",
     "fixAlphaTransparencyArtifacts": true,
-    "hasAlpha": false,
+    "hasAlpha": true,
     "redirect": "2179c916-7da1-4a48-bf40-70c0b654f9d9@6c48a"
   }
 }
diff --git a/assets/res/material/cube-material.mtl b/assets/res/material/cube-material.mtl
@@ -46,18 +46,18 @@
     {
       "mainColor": {
         "__type__": "cc.Color",
-        "r": 255,
-        "g": 193,
-        "b": 158,
+        "r": 42,
+        "g": 42,
+        "b": 42,
         "a": 255
       },
       "roughness": 0.715,
       "metallic": 0.513,
       "specularIntensity": 0.68,
       "emissive": {
         "__type__": "cc.Color",
-        "r": 201,
-        "g": 89,
+        "r": 31,
+        "g": 18,
         "b": 0,
         "a": 255
       }

diff --git a/assets/res/material/cube-physics-material.pmtl b/assets/res/material/cube-physics-material.pmtl
@@ -3,7 +3,7 @@
   "_name": "",
   "_objFlags": 0,
   "_native": "",
-  "_friction": 0.8,
+  "_friction": 0.7,
   "_rollingFriction": 0,
   "_spinningFriction": 0,
   "_restitution": 0.1

diff --git a/assets/res/material/kun-material.mtl b/assets/res/material/kun-material.mtl
@@ -4,16 +4,38 @@
   "_objFlags": 0,
   "_native": "",
   "_effectAsset": {
-    "__uuid__": "bf4078d6-d2d7-4073-83bb-cd6f1802e880",
+    "__uuid__": "1baf0fc9-befa-459c-8bdd-af1a450a0319",
     "__expectedType__": "cc.EffectAsset"
   },
   "_techIdx": "0",
   "_defines": [
     {
-      "USE_TEXTURE": true
-    }
+      "USE_ALBEDO_MAP": true,
+      "USE_EMISSIVE_MAP": true,
+      "USE_ALPHA_TEST": true
+    },
+    {},
+    {}
   ],
   "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
     {
       "rasterizerState": {},
       "depthStencilState": {},
@@ -29,7 +51,13 @@
       "mainTexture": {
         "__uuid__": "2179c916-7da1-4a48-bf40-70c0b654f9d9@6c48a",
         "__expectedType__": "cc.Texture2D"
+      },
+      "emissiveMap": {
+        "__uuid__": "2179c916-7da1-4a48-bf40-70c0b654f9d9@6c48a",
+        "__expectedType__": "cc.Texture2D"
       }
-    }
+    },
+    {},
+    {}
   ]
 }
diff --git a/assets/scene/Main.scene b/assets/scene/Main.scene
@@ -61,9 +61,9 @@
     "_prefab": null,
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -21.213,
-      "y": 25.531,
-      "z": -10.215
+      "x": -19.332,
+      "y": 22.134,
+      "z": -13.072
     },
     "_lrot": {
       "__type__": "cc.Quat",
@@ -121,7 +121,7 @@
     "_shadowFixedArea": true,
     "_shadowNear": 0.1,
     "_shadowFar": 50,
-    "_shadowOrthoSize": 30,
+    "_shadowOrthoSize": 34,
     "_id": "597uMYCbhEtJQc0ffJlcgA"
   },
   {
@@ -3112,7 +3112,7 @@
       "b": 255,
       "a": 255
     },
-    "_string": "🐓",
+    "_string": "♾️",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 120,
@@ -3546,7 +3546,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_useGrayscale": false,
     "_atlas": null,
     "_id": "84Mc7eiV1IyZcyJiAhwDPs"

diff --git a/assets/script/game/AudioController.ts b/assets/script/game/AudioController.ts
@@ -27,7 +27,7 @@ export class AudioController extends Component {
     audioSource: AudioSource = null;
 
     public static playEffect(audio: AudioClip) {
-        AudioController.instance.audioSource.playOneShot(audio);
+        AudioController.instance?.audioSource?.playOneShot(audio);
     }
 
     start() {

diff --git a/assets/script/game/Character/BallController.ts b/assets/script/game/Character/BallController.ts
@@ -29,8 +29,8 @@ export class BallController extends BaseController {
     onTouchStart(event: EventTouch) {
         // Util.log('球被触摸到');
 
-        // 点到球扣一分
-        GameManager.curScore -= 1;
+        // 点到球加一分
+        GameManager.curScore += 1;
         // 缓动销毁
         Util.tweenDestroy(0.3, this.node, null);
 

diff --git a/assets/script/game/Character/CubeController.ts b/assets/script/game/Character/CubeController.ts
@@ -44,16 +44,31 @@ export class CubeController extends BaseController {
                 .to(0.3, { scale: v3(1, 1, 1) }, { easing: 'quartOut' })
                 .start();
 
-
             // kunkun 掉落扣分
             if (this.jiNode.active) {
                 GameManager.curScore -= 20;
                 AudioController.playEffect(AudioController.instance.errAudio);
             } else {
                 GameManager.curScore -= 2;
             }
+
+            if (GameManager.mode = 'inf') {
+                // 无穷模式掉落一个就死亡
+                GameManager.gameOver();
+            }
             this.isDead = true;
         }
+
+        // if (this.node.parent.name === 'Cubes') {
+        //     // 限制最低速度
+        //     let vec3 = v3();
+        //     this.rigidbody.getLinearVelocity(vec3);
+        //     let vel = 5 + 2 * Math.pow(GameManager.time, 0.5);
+        //     if (vec3.z < vel) {
+        //         vec3.z = vel;
+        //         this.rigidbody.setLinearVelocity(vec3);
+        //     }
+        // }
     }
 
     // 向摄像机方向移动
@@ -94,9 +109,9 @@ export class CubeController extends BaseController {
 
         // 飞天
         tween(this.node)
-            .by(0.4, { position: v3(0, this.node.position.z / 3, 0) }, { easing: 'smooth' })
+            .by(0.8, { position: v3(0, this.node.position.z / 3, 0) }, { easing: 'smooth' })
             .call(() => {
-                this.node.destroy();
+                Util.tweenDestroy(0.3, this.node);
 
                 if (GameManager.mode === 'taimei') {
                     // 放一个篮球下去
@@ -108,8 +123,8 @@ export class CubeController extends BaseController {
             }).start();
 
         // 旋转鸡螺旋桨
-        Util.tweenNumber(0.4, 0, 1, (num: number) => {
-            this.jiNode?.setRotationFromEuler(v3(0, num * 360 * 4, 0))
+        Util.tweenNumber(0.8, 0, 1, (num: number) => {
+            this.jiNode?.setRotationFromEuler(v3(0, num * 360 * 8, 0))
         });
     }
 
@@ -119,12 +134,12 @@ export class CubeController extends BaseController {
 
     onTouchEnd(event: EventTouch) {
         // 恢复颜色
-        this.material.setProperty('albedo', this.initAlbedo);
+        // this.material.setProperty('albedo', this.initAlbedo);
     }
 
     onTouchCancel(event: EventTouch) {
         // 恢复颜色
-        this.material.setProperty('albedo', this.initAlbedo);
+        // this.material.setProperty('albedo', this.initAlbedo);
     }
 
 

diff --git a/assets/script/game/GameManager.ts b/assets/script/game/GameManager.ts
@@ -61,9 +61,10 @@ export class GameManager extends Component {
     private _maxScore: number = 0;
     private _minScore: number = 0;
 
-    public static hp = Constant.INIT_HP;
+    public static time = 0;
+    public static hp = 0;
     public static state: 'gameover' | 'normal' | 'idle' = 'normal';
-    public static mode: 'jini' | 'taimei' = 'jini';
+    public static mode: 'jini' | 'taimei' | 'inf' = 'inf';
 
 
     start() {
@@ -87,7 +88,6 @@ export class GameManager extends Component {
         }
 
         // 初始化游戏
-        GameManager.state = 'normal';
         this.gameOverLabel.node.setScale(v3(0, 0, 0));
         this.gameOverSprite.node.setScale(v3(0, 0, 0));
 
@@ -102,9 +102,15 @@ export class GameManager extends Component {
     }
 
     update(deltaTime: number) {
+        GameManager.time += deltaTime;
 
-        // 时间流逝扣血
-        GameManager.hp -= deltaTime;
+        if (GameManager.mode === 'inf') {
+            // 时间流逝加血
+            GameManager.hp += deltaTime;
+        } else {
+            // 时间流逝扣血
+            GameManager.hp -= deltaTime;
+        }
 
         // 小于 0 游戏结束
         if (GameManager.hp < 0 && GameManager.state === 'normal') {
@@ -123,11 +129,14 @@ export class GameManager extends Component {
     }
 
     public onChangeButtonClick() {
-
         if (GameManager.mode === 'jini') {
             GameManager.mode = 'taimei';
             GameManager.instance.buttonLabel.string = '🏀';
-        } else {
+        } else if (GameManager.mode === 'taimei') {
+            GameManager.mode = 'inf';
+            GameManager.instance.buttonLabel.string = '♾️';
+        }
+        else if (GameManager.mode === 'inf') {
             GameManager.mode = 'jini';
             GameManager.instance.buttonLabel.string = '🐓';
         }
@@ -307,19 +316,27 @@ export class GameManager extends Component {
 
     public static touchCubeOnce() {
 
-        // 与上次不同的随机选取一个
-        let index = 0;
-        for (; ;) {
-            index = randomRangeInt(0, GameManager.instance.cubesPosNode.children.length);
-            if (index != this.lastChoiceIndex) {
-                this.lastChoiceIndex = index;
-                break;
+        // 难度曲线
+        let normalTime = GameManager.time / 100;
+        let ex = Math.exp(normalTime);
+        let prob = ex / (1 + ex);
+
+        // 生成新砖块的概率
+        if (Math.random() < prob) {
+            // 与上次不同的随机选取一个
+            let index = 0;
+            for (; ;) {
+                index = randomRangeInt(0, GameManager.instance.cubesPosNode.children.length);
+                if (index != this.lastChoiceIndex) {
+                    this.lastChoiceIndex = index;
+                    break;
+                }
             }
+            // 创建新方块
+            let cube = instantiate(GameManager.instance.cubesPosNode.children[index]);
+            cube.worldPosition = cube.position.add(v3(0, 0, cube.scale.z + 1));
+            GameManager.instance.cubesNode.addChild(cube);
         }
-        // 创建新方块
-        let cube = instantiate(GameManager.instance.cubesPosNode.children[index]);
-        cube.worldPosition = cube.position.add(v3(0, 0, cube.scale.z + 1));
-        GameManager.instance.cubesNode.addChild(cube);
 
         // 移动下一次
         GameManager.instance.scheduleOnce(GameManager.moveCubesNext);

diff --git a/assets/script/util/Util.ts b/assets/script/util/Util.ts
@@ -59,7 +59,7 @@ export class Util {
     }
 
     //  缓动销毁
-    public static tweenDestroy(duration: number, node: Node, callback: () => void) {
+    public static tweenDestroy(duration: number, node: Node, callback: () => void = null) {
         tween(node).to(duration, { scale: v3(0, 0, 0) }, { easing: 'quartOut' }).call(() => {
             // Util.log('销毁', node);
             node.destroy();

diff --git a/doc/banner.png b/doc/banner.png
diff --git a/doc/banner.psd b/doc/banner.psd
diff --git a/doc/ic_launcher.psd b/doc/ic_launcher.psd
diff --git a/doc/image/Screenshot_com.shao.ikun.jpg b/doc/image/Screenshot_com.shao.ikun.jpg
diff --git a/doc/image/Screenshot_com.shao.ikun_3.jpg b/doc/image/Screenshot_com.shao.ikun_3.jpg
diff --git a/doc/video.png b/doc/video.png
diff --git a/doc/video.psd b/doc/video.psd
diff --git a/doc/蔡鸡篮球Icon.png b/doc/蔡鸡篮球Icon.png
diff --git a/doc/蔡鸡篮球Icon.psd b/doc/蔡鸡篮球Icon.psd
diff --git a/doc/隐私政策.pdf b/doc/隐私政策.pdf
diff --git a/doc/隐私政策.png b/doc/隐私政策.png