1.02
This commit is contained in:
parent
f9e4374808
commit
798e3a9f6b
8 changed files with 1441 additions and 91 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -40269,7 +40269,7 @@
|
|||
1,
|
||||
2,
|
||||
0,
|
||||
1,
|
||||
4,
|
||||
1
|
||||
]
|
||||
},
|
||||
|
|
@ -40277,7 +40277,7 @@
|
|||
"code": 117,
|
||||
"indent": 3,
|
||||
"parameters": [
|
||||
171
|
||||
537
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
@ -40285,6 +40285,44 @@
|
|||
"indent": 3,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 411,
|
||||
"indent": 2,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 111,
|
||||
"indent": 3,
|
||||
"parameters": [
|
||||
1,
|
||||
2,
|
||||
0,
|
||||
1,
|
||||
1
|
||||
]
|
||||
},
|
||||
{
|
||||
"code": 117,
|
||||
"indent": 4,
|
||||
"parameters": [
|
||||
538
|
||||
]
|
||||
},
|
||||
{
|
||||
"code": 0,
|
||||
"indent": 4,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 412,
|
||||
"indent": 3,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 0,
|
||||
"indent": 3,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 412,
|
||||
"indent": 2,
|
||||
|
|
|
|||
|
|
@ -30713,6 +30713,8 @@
|
|||
"y": 13
|
||||
},
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
]
|
||||
}
|
||||
|
|
@ -3234,14 +3234,52 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"code": 121,
|
||||
"code": 111,
|
||||
"indent": 2,
|
||||
"parameters": [
|
||||
0,
|
||||
22,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"code": 111,
|
||||
"indent": 3,
|
||||
"parameters": [
|
||||
0,
|
||||
32,
|
||||
1
|
||||
]
|
||||
},
|
||||
{
|
||||
"code": 121,
|
||||
"indent": 4,
|
||||
"parameters": [
|
||||
271,
|
||||
271,
|
||||
0
|
||||
]
|
||||
},
|
||||
{
|
||||
"code": 0,
|
||||
"indent": 4,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 412,
|
||||
"indent": 3,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 0,
|
||||
"indent": 3,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 412,
|
||||
"indent": 2,
|
||||
"parameters": []
|
||||
},
|
||||
{
|
||||
"code": 0,
|
||||
"indent": 2,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"order": 19,
|
||||
"parentId": 0,
|
||||
"scrollX": 1081.3333333333333,
|
||||
"scrollY": 911.3333333333334
|
||||
"scrollY": 610
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
"order": 15,
|
||||
"parentId": 0,
|
||||
"scrollX": 1081.3333333333333,
|
||||
"scrollY": 1118
|
||||
"scrollY": 1080.6666666666667
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
"name": "食堂・売店",
|
||||
"order": 1,
|
||||
"parentId": 0,
|
||||
"scrollX": 1126.6666666666667,
|
||||
"scrollX": 1081.3333333333333,
|
||||
"scrollY": 600.6666666666666
|
||||
},
|
||||
{
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
"order": 4,
|
||||
"parentId": 0,
|
||||
"scrollX": 1081.3333333333333,
|
||||
"scrollY": 1116.6666666666667
|
||||
"scrollY": 1128.6666666666667
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
|
|
@ -407,6 +407,6 @@
|
|||
"order": 45,
|
||||
"parentId": 0,
|
||||
"scrollX": 1081.3333333333333,
|
||||
"scrollY": 610
|
||||
"scrollY": 682
|
||||
}
|
||||
]
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
"pitch": 100,
|
||||
"volume": 90
|
||||
},
|
||||
"editMapId": 49,
|
||||
"editMapId": 7,
|
||||
"elements": [
|
||||
"",
|
||||
"物理",
|
||||
|
|
@ -2747,8 +2747,8 @@
|
|||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"加算回数(剣術)",
|
||||
"加算回数(知識)",
|
||||
"",
|
||||
"アーテル場所乱数",
|
||||
"トイレガチャガチャ吸う",
|
||||
|
|
@ -2891,7 +2891,7 @@
|
|||
"",
|
||||
""
|
||||
],
|
||||
"versionId": 44441053,
|
||||
"versionId": 29871517,
|
||||
"victoryMe": {
|
||||
"name": "Victory1",
|
||||
"pan": 0,
|
||||
|
|
@ -2929,5 +2929,5 @@
|
|||
],
|
||||
"hasEncryptedImages": true,
|
||||
"hasEncryptedAudio": true,
|
||||
"encryptionKey": "7ed30606d662e8ac76b8f23b14956b9a"
|
||||
"encryptionKey": "6e8212589491b92336542f93de2836ea"
|
||||
}
|
||||
|
|
@ -23315,9 +23315,9 @@
|
|||
this.frameBuffer.texture.enableLinearScaling();
|
||||
}
|
||||
/*
|
||||
A frame buffer needs a target to render to..
|
||||
create a texture and bind it attach it to the framebuffer..
|
||||
*/
|
||||
A frame buffer needs a target to render to..
|
||||
create a texture and bind it attach it to the framebuffer..
|
||||
*/
|
||||
|
||||
// this is used by the base texture
|
||||
this.texture = this.frameBuffer.texture;
|
||||
|
|
@ -39079,15 +39079,15 @@
|
|||
var sqrt = Math.sqrt;
|
||||
|
||||
/* a good approximation for hue rotation
|
||||
This matrix is far better than the versions with magic luminance constants
|
||||
formerly used here, but also used in the starling framework (flash) and known from this
|
||||
old part of the internet: quasimondo.com/archives/000565.php
|
||||
This new matrix is based on rgb cube rotation in space. Look here for a more descriptive
|
||||
implementation as a shader not a general matrix:
|
||||
https://github.com/evanw/glfx.js/blob/58841c23919bd59787effc0333a4897b43835412/src/filters/adjust/huesaturation.js
|
||||
This is the source for the code:
|
||||
see http://stackoverflow.com/questions/8507885/shift-hue-of-an-rgb-color/8510751#8510751
|
||||
*/
|
||||
This matrix is far better than the versions with magic luminance constants
|
||||
formerly used here, but also used in the starling framework (flash) and known from this
|
||||
old part of the internet: quasimondo.com/archives/000565.php
|
||||
This new matrix is based on rgb cube rotation in space. Look here for a more descriptive
|
||||
implementation as a shader not a general matrix:
|
||||
https://github.com/evanw/glfx.js/blob/58841c23919bd59787effc0333a4897b43835412/src/filters/adjust/huesaturation.js
|
||||
This is the source for the code:
|
||||
see http://stackoverflow.com/questions/8507885/shift-hue-of-an-rgb-color/8510751#8510751
|
||||
*/
|
||||
|
||||
var w = 1 / 3;
|
||||
var sqrW = sqrt(w); // weight is
|
||||
|
|
@ -44433,36 +44433,36 @@
|
|||
var DEFAULT_BORDER_SIZE = 10;
|
||||
|
||||
/**
|
||||
* The NineSlicePlane allows you to stretch a texture using 9-slice scaling. The corners will remain unscaled (useful
|
||||
* for buttons with rounded corners for example) and the other areas will be scaled horizontally and or vertically
|
||||
*
|
||||
*```js
|
||||
* let Plane9 = new PIXI.NineSlicePlane(PIXI.Texture.fromImage('BoxWithRoundedCorners.png'), 15, 15, 15, 15);
|
||||
* ```
|
||||
* <pre>
|
||||
* A B
|
||||
* +---+----------------------+---+
|
||||
* C | 1 | 2 | 3 |
|
||||
* +---+----------------------+---+
|
||||
* | | | |
|
||||
* | 4 | 5 | 6 |
|
||||
* | | | |
|
||||
* +---+----------------------+---+
|
||||
* D | 7 | 8 | 9 |
|
||||
* +---+----------------------+---+
|
||||
|
||||
* When changing this objects width and/or height:
|
||||
* areas 1 3 7 and 9 will remain unscaled.
|
||||
* areas 2 and 8 will be stretched horizontally
|
||||
* areas 4 and 6 will be stretched vertically
|
||||
* area 5 will be stretched both horizontally and vertically
|
||||
* </pre>
|
||||
*
|
||||
* @class
|
||||
* @extends PIXI.mesh.Plane
|
||||
* @memberof PIXI.mesh
|
||||
*
|
||||
*/
|
||||
* The NineSlicePlane allows you to stretch a texture using 9-slice scaling. The corners will remain unscaled (useful
|
||||
* for buttons with rounded corners for example) and the other areas will be scaled horizontally and or vertically
|
||||
*
|
||||
*```js
|
||||
* let Plane9 = new PIXI.NineSlicePlane(PIXI.Texture.fromImage('BoxWithRoundedCorners.png'), 15, 15, 15, 15);
|
||||
* ```
|
||||
* <pre>
|
||||
* A B
|
||||
* +---+----------------------+---+
|
||||
* C | 1 | 2 | 3 |
|
||||
* +---+----------------------+---+
|
||||
* | | | |
|
||||
* | 4 | 5 | 6 |
|
||||
* | | | |
|
||||
* +---+----------------------+---+
|
||||
* D | 7 | 8 | 9 |
|
||||
* +---+----------------------+---+
|
||||
|
||||
* When changing this objects width and/or height:
|
||||
* areas 1 3 7 and 9 will remain unscaled.
|
||||
* areas 2 and 8 will be stretched horizontally
|
||||
* areas 4 and 6 will be stretched vertically
|
||||
* area 5 will be stretched both horizontally and vertically
|
||||
* </pre>
|
||||
*
|
||||
* @class
|
||||
* @extends PIXI.mesh.Plane
|
||||
* @memberof PIXI.mesh
|
||||
*
|
||||
*/
|
||||
|
||||
var NineSlicePlane = (function (_Plane) {
|
||||
_inherits(NineSlicePlane, _Plane);
|
||||
|
|
|
|||
|
|
@ -373,10 +373,7 @@ var utakata = utakata || (utakata = {});
|
|||
var switchesJson = this._getTargetSwitchJson();
|
||||
var variablesJson = this._getTargetVariableJson();
|
||||
|
||||
var json = {
|
||||
gameSwitches: switchesJson,
|
||||
gameVariables: variablesJson,
|
||||
};
|
||||
var json = { gameSwitches: switchesJson, gameVariables: variablesJson };
|
||||
|
||||
DataManager.saveCommonSave(json);
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue