update SDL2 Android Java codes. [skip CI]

IppClub · Jan 8, 2024 · e9a4daa · e9a4daa
1 parent f0aac9c
commit e9a4daa
Show file tree

Hide file tree

Showing 135 changed files with 1,592 additions and 72 deletions.
diff --git a/Assets/Data/data.xlsx b/Assets/Data/data.xlsx
diff --git a/Assets/Data/items.xlsx b/Assets/Data/items.xlsx
diff --git a/Assets/Doc/image/dora-toto.png b/Assets/Doc/image/dora-toto.png
diff --git a/Assets/DragonBones/NewDragon_tex.png b/Assets/DragonBones/NewDragon_tex.png
diff --git a/Assets/Font/sarasa-mono-sc-regular.ttf b/Assets/Font/sarasa-mono-sc-regular.ttf
diff --git a/Assets/Image/Dismentalism.png b/Assets/Image/Dismentalism.png
diff --git a/Assets/Image/LuvSenseDigital.png b/Assets/Image/LuvSenseDigital.png
diff --git a/Assets/Image/ZombieEscape.png b/Assets/Image/ZombieEscape.png
diff --git a/Assets/Image/dora.svg b/Assets/Image/dora.svg
diff --git a/Assets/Image/logo.png b/Assets/Image/logo.png
diff --git a/Assets/Model/Units.png b/Assets/Model/Units.png
diff --git a/Assets/Model/bunny.png b/Assets/Model/bunny.png
diff --git a/Assets/Model/dorothy.png b/Assets/Model/dorothy.png
diff --git a/Assets/Model/duality.png b/Assets/Model/duality.png
diff --git a/Assets/Model/flandre.png b/Assets/Model/flandre.png
diff --git a/Assets/Model/hpshow.png b/Assets/Model/hpshow.png
diff --git a/Assets/Model/items.png b/Assets/Model/items.png
diff --git a/Assets/Model/misc.png b/Assets/Model/misc.png
diff --git a/Assets/Model/patreon.png b/Assets/Model/patreon.png
diff --git a/Assets/Model/poke.png b/Assets/Model/poke.png
diff --git a/Assets/Model/villy.png b/Assets/Model/villy.png
diff --git a/Assets/Model/xiaoli.png b/Assets/Model/xiaoli.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/cube.png b/Assets/Script/Game/Touch the Sky/Image/cube.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/heart_0.png b/Assets/Script/Game/Touch the Sky/Image/heart_0.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/heart_1.png b/Assets/Script/Game/Touch the Sky/Image/heart_1.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/heart_2.png b/Assets/Script/Game/Touch the Sky/Image/heart_2.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/heart_3.png b/Assets/Script/Game/Touch the Sky/Image/heart_3.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/red.png b/Assets/Script/Game/Touch the Sky/Image/red.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/restart.png b/Assets/Script/Game/Touch the Sky/Image/restart.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/sky.png b/Assets/Script/Game/Touch the Sky/Image/sky.png
diff --git a/Assets/Script/Game/Touch the Sky/Image/spring.png b/Assets/Script/Game/Touch the Sky/Image/spring.png
diff --git a/Assets/Spine/dragon-ess.atlas b/Assets/Spine/dragon-ess.atlas
@@ -0,0 +1,106 @@
+dragon-ess.png
+size:400,3384
+filter:Linear,Linear
+back
+bounds:209,222,190,185
+rotate:90
+chest
+bounds:256,1807,136,122
+chin
+bounds:253,1592,214,146
+rotate:90
+front-toe-a
+bounds:119,7,29,50
+front-toe-b
+bounds:1,1,56,57
+rotate:90
+head
+bounds:1,3123,296,260
+left-front-leg
+bounds:298,3265,84,57
+left-front-thigh
+bounds:298,3192,84,72
+left-rear-leg
+bounds:258,1183,168,132
+offsets:19,20,206,177
+rotate:90
+left-rear-thigh
+bounds:307,1930,91,148
+offsets:0,0,91,149
+left-wing01
+bounds:1,994,191,256
+rotate:90
+left-wing02
+bounds:1,814,179,269
+rotate:90
+left-wing03
+bounds:1,226,186,207
+rotate:90
+left-wing04
+bounds:257,994,188,135
+rotate:90
+left-wing05
+bounds:1,600,218,213
+left-wing06
+bounds:1,2261,192,331
+rotate:90
+left-wing07
+bounds:220,558,159,255
+left-wing08
+bounds:206,57,164,181
+rotate:90
+left-wing09
+bounds:1,58,204,167
+right-front-leg
+bounds:265,1501,101,89
+right-front-thigh
+bounds:281,413,108,108
+right-rear-leg
+bounds:274,2454,116,100
+right-rear-thigh
+bounds:265,1352,91,148
+offsets:0,0,91,149
+right-rear-toe
+bounds:312,2676,105,77
+offsets:0,0,109,77
+rotate:90
+right-wing01
+bounds:1,2702,219,310
+rotate:90
+right-wing02
+bounds:1,2057,203,305
+rotate:90
+right-wing03
+bounds:1,2454,272,247
+right-wing04
+bounds:1,413,279,144
+right-wing05
+bounds:1,1592,251,229
+right-wing06
+bounds:1,2922,200,366
+rotate:90
+right-wing07
+bounds:1,1391,200,263
+rotate:90
+right-wing08
+bounds:1,1822,234,254
+rotate:90
+right-wing09
+bounds:1,1186,248,204
+tail01
+bounds:271,814,120,153
+tail02
+bounds:274,2555,95,120
+tail03
+bounds:312,2782,73,92
+tail04
+bounds:298,3323,56,71
+rotate:90
+tail05
+bounds:59,5,52,59
+rotate:90
+tail06
+bounds:298,3123,95,68
+thiagobrayner
+bounds:332,2079,350,31
+rotate:90
diff --git a/Assets/Spine/dragon-ess.png b/Assets/Spine/dragon-ess.png
diff --git a/Assets/Spine/dragon-ess.skel b/Assets/Spine/dragon-ess.skel
diff --git a/Assets/Spine/moling.atlas b/Assets/Spine/moling.atlas
@@ -0,0 +1,96 @@
+moling.png
+size:357,1122
+filter:Linear,Linear
+scale:0.38118
+23
+bounds:85,916,23,9
+body_0
+bounds:303,362,87,42
+rotate:90
+body_1
+bounds:0,769,21,24
+body_10
+bounds:0,557,134,324
+offsets:8,0,142,330
+rotate:90
+body_11
+bounds:0,215,96,157
+rotate:270
+body_12
+bounds:0,158,77,143
+rotate:90
+body_13
+bounds:166,182,69,160
+rotate:90
+body_14
+bounds:140,136,62,147
+offsets:0,8,62,155
+rotate:270
+body_15
+bounds:0,414,144,210
+rotate:270
+body_16
+bounds:298,925,112,40
+rotate:90
+body_17
+bounds:303,449,110,26
+rotate:90
+body_18
+bounds:0,902,85,23
+body_19
+bounds:0,925,298,197
+body_2
+bounds:0,6,64,67
+rotate:90
+body_20
+bounds:97,314,113,103
+body_21
+bounds:0,69,103,101
+rotate:270
+body_22
+bounds:144,1,42,54
+body_23
+bounds:112,244,123,200
+rotate:270
+body_24
+bounds:75,54,108,148
+rotate:90
+body_25
+bounds:0,678,247,267
+offsets:0,0,247,271
+rotate:90
+body_26
+bounds:310,54,44,73
+body_3
+bounds:298,1037,59,61
+body_4
+bounds:0,315,85,99
+body_43
+bounds:0,898,5,4
+body_5
+bounds:325,162,26,36
+body_6
+bounds:310,127,30,35
+body_7
+bounds:274,1,53,73
+rotate:90
+body_8
+bounds:202,0,54,72
+rotate:90
+body_9
+bounds:67,15,55,77
+rotate:90
+lower
+bounds:265,787,138,68
+rotate:90
+m
+bounds:261,686,78,93
+offsets:0,2,79,95
+m2
+bounds:232,223,79,110
+offsets:0,1,80,114
+rotate:270
+middle
+bounds:210,382,93,176
+upper
+bounds:254,54,56,84
diff --git a/Assets/Spine/moling.png b/Assets/Spine/moling.png
diff --git a/Assets/Spine/moling.skel b/Assets/Spine/moling.skel
diff --git a/Project/Android/Dora/app/src/main/ic_launcher-playstore.png b/Project/Android/Dora/app/src/main/ic_launcher-playstore.png
diff --git a/Project/Android/Dora/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/Project/Android/Dora/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
@@ -186,7 +186,7 @@ public BluetoothGatt getGatt() {
     // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
     // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
     private BluetoothGatt connectGatt(boolean managed) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
             try {
                 return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
             } catch (Exception e) {
@@ -429,7 +429,7 @@ public void run() {
                     }
                 });
             }
-        } 
+        }
         else if (newState == 0) {
             mIsConnected = false;
         }