File tree
15 files changed
+290
-36
lines changed- cocos
- audio/android
- platform/android
- java/src/org/cocos2dx/lib
15 files changed
+290
-36
lines changedLines changed: 47 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
27 |
| - | |
28 | 26 |
| |
29 | 27 |
| |
30 | 28 |
| |
| |||
43 | 41 |
| |
44 | 42 |
| |
45 | 43 |
| |
| 44 | + | |
46 | 45 |
| |
47 | 46 |
| |
48 | 47 |
| |
| |||
55 | 54 |
| |
56 | 55 |
| |
57 | 56 |
| |
58 |
| - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
59 | 62 |
| |
| 63 | + | |
| 64 | + | |
60 | 65 |
| |
61 | 66 |
| |
62 | 67 |
| |
| |||
117 | 122 |
| |
118 | 123 |
| |
119 | 124 |
| |
| 125 | + | |
120 | 126 |
| |
121 | 127 |
| |
122 | 128 |
| |
| |||
145 | 151 |
| |
146 | 152 |
| |
147 | 153 |
| |
| 154 | + | |
| 155 | + | |
148 | 156 |
| |
149 | 157 |
| |
150 | 158 |
| |
| |||
225 | 233 |
| |
226 | 234 |
| |
227 | 235 |
| |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
228 | 244 |
| |
229 | 245 |
| |
230 | 246 |
| |
| |||
274 | 290 |
| |
275 | 291 |
| |
276 | 292 |
| |
| 293 | + | |
277 | 294 |
| |
278 | 295 |
| |
279 | 296 |
| |
| |||
439 | 456 |
| |
440 | 457 |
| |
441 | 458 |
| |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
442 | 486 |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
72 | 72 |
| |
73 | 73 |
| |
74 | 74 |
| |
| 75 | + | |
75 | 76 |
| |
76 | 77 |
| |
77 | 78 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
68 | 68 |
| |
69 | 69 |
| |
70 | 70 |
| |
| 71 | + | |
| 72 | + | |
71 | 73 |
| |
72 | 74 |
| |
73 | 75 |
| |
|
Lines changed: 5 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
110 | 110 |
| |
111 | 111 |
| |
112 | 112 |
| |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
113 | 118 |
| |
114 | 119 |
| |
115 | 120 |
| |
|
Lines changed: 2 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
62 | 62 |
| |
63 | 63 |
| |
64 | 64 |
| |
| 65 | + | |
| 66 | + | |
65 | 67 |
| |
66 | 68 |
| |
67 | 69 |
| |
|
Lines changed: 9 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
41 | 41 |
| |
42 | 42 |
| |
43 | 43 |
| |
| 44 | + | |
44 | 45 |
| |
45 | 46 |
| |
46 | 47 |
| |
| |||
52 | 53 |
| |
53 | 54 |
| |
54 | 55 |
| |
55 |
| - | |
| 56 | + | |
| 57 | + | |
56 | 58 |
| |
57 | 59 |
| |
58 | 60 |
| |
| |||
83 | 85 |
| |
84 | 86 |
| |
85 | 87 |
| |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
86 | 94 |
| |
87 | 95 |
| |
88 | 96 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
62 | 62 |
| |
63 | 63 |
| |
64 | 64 |
| |
| 65 | + | |
| 66 | + | |
65 | 67 |
| |
66 | 68 |
| |
67 | 69 |
| |
| |||
96 | 98 |
| |
97 | 99 |
| |
98 | 100 |
| |
| 101 | + | |
99 | 102 |
| |
100 | 103 |
| |
101 | 104 |
| |
|
Lines changed: 24 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
63 |
| - | |
| 63 | + | |
64 | 64 |
| |
65 | 65 |
| |
66 | 66 |
| |
| |||
215 | 215 |
| |
216 | 216 |
| |
217 | 217 |
| |
218 |
| - | |
| 218 | + | |
219 | 219 |
| |
220 |
| - | |
221 | 220 |
| |
222 | 221 |
| |
223 | 222 |
| |
224 | 223 |
| |
225 | 224 |
| |
226 | 225 |
| |
227 |
| - | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
228 | 248 |
| |
229 | 249 |
| |
230 | 250 |
| |
| |||
362 | 382 |
| |
363 | 383 |
| |
364 | 384 |
| |
365 |
| - | |
366 |
| - | |
367 |
| - | |
368 |
| - | |
369 |
| - | |
370 | 385 |
| |
371 | 386 |
| |
372 | 387 |
| |
|
Lines changed: 5 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
68 | 68 |
| |
69 | 69 |
| |
70 | 70 |
| |
| 71 | + | |
| 72 | + | |
71 | 73 |
| |
72 | 74 |
| |
73 | 75 |
| |
| |||
97 | 99 |
| |
98 | 100 |
| |
99 | 101 |
| |
| 102 | + | |
| 103 | + | |
100 | 104 |
| |
101 | 105 |
| |
102 | 106 |
| |
| |||
115 | 119 |
| |
116 | 120 |
| |
117 | 121 |
| |
| 122 | + | |
118 | 123 |
| |
119 | 124 |
| |
120 | 125 |
| |
|
Lines changed: 7 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
33 | 33 |
| |
34 | 34 |
| |
35 | 35 |
| |
36 |
| - | |
37 | 36 |
| |
38 | 37 |
| |
39 |
| - | |
40 | 38 |
| |
41 |
| - | |
42 | 39 |
| |
| 40 | + | |
43 | 41 |
| |
44 | 42 |
| |
45 |
| - | |
46 | 43 |
| |
47 | 44 |
| |
48 | 45 |
| |
| |||
74 | 71 |
| |
75 | 72 |
| |
76 | 73 |
| |
77 |
| - | |
| 74 | + | |
78 | 75 |
| |
79 | 76 |
| |
80 | 77 |
| |
| |||
135 | 132 |
| |
136 | 133 |
| |
137 | 134 |
| |
| 135 | + | |
138 | 136 |
| |
139 | 137 |
| |
140 | 138 |
| |
141 | 139 |
| |
142 | 140 |
| |
143 |
| - | |
| 141 | + | |
144 | 142 |
| |
145 | 143 |
| |
146 | 144 |
| |
| |||
153 | 151 |
| |
154 | 152 |
| |
155 | 153 |
| |
| 154 | + | |
156 | 155 |
| |
157 | 156 |
| |
158 | 157 |
| |
| |||
178 | 177 |
| |
179 | 178 |
| |
180 | 179 |
| |
| 180 | + | |
181 | 181 |
| |
182 | 182 |
| |
183 | 183 |
| |
184 | 184 |
| |
185 | 185 |
| |
186 | 186 |
| |
| 187 | + | |
187 | 188 |
| |
188 | 189 |
| |
189 | 190 |
| |
|
0 commit comments