Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.

Commit 553d9ed

Browse files
committed
fix
1 parent aa1b873 commit 553d9ed

File tree

11 files changed

+36
-75
lines changed

11 files changed

+36
-75
lines changed
Binary file not shown.

ported_plugins/behaviors/rex_pin2imagepoint/source/c2runtime/runtime.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ cr.behaviors.Rex_pin2imgpt = function(runtime)
3737
{
3838
this.imgptX_get = cr.plugins_.Sprite.prototype.exps.ImagePointX;
3939
this.imgptY_get = cr.plugins_.Sprite.prototype.exps.ImagePointY;
40-
console.log(this.imgptX_get,this.imgptY_get);
4140
}
4241
};
4342
/////////////////////////////////////
-2.76 KB
Binary file not shown.

ported_plugins/plugins/rex_csv2array/source/c3runtime/conditions.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212

1313
var current_frame = this._runtime.GetEventSheetManager().GetCurrentEventStackFrame();
1414
var current_event = current_frame.GetCurrentEvent();
15+
var solmod = current_event.GetSolModifiers();
1516
var solModifierAfterCnds = current_frame.IsSolModifierAfterCnds();
1617
var c = this._runtime.GetEventSheetManager().GetEventStack();
17-
var h = c.Push(current_event);
18+
var p = this._runtime.GetEventStack();
19+
var h = c.Push(current_event);
20+
1821
this.exp_Width = x_cnt;
1922
this.exp_Height = y_cnt;
2023
if (solModifierAfterCnds)
@@ -24,15 +27,16 @@
2427
this.exp_CurY = j;
2528
for (i=0; i<x_cnt; i++ )
2629
{
27-
this._runtime.GetEventSheetManager().GetEventStack().PushCopySol(current_event.solModifiers);
30+
this._runtime.GetEventSheetManager().PushCopySol(solmod);
2831

2932
this.exp_CurX = i;
3033
this.exp_CurValue = this.value_get(table[j][i]);
3134
current_event.Retrigger(current_frame,h);
3235

33-
this._runtime.GetEventSheetManager().GetEventStack().PopSol(current_event.solModifiers);
36+
this._runtime.GetEventSheetManager().PopSol(solmod);
3437
}
35-
}
38+
}
39+
p.Pop();
3640
}
3741
else
3842
{
@@ -44,11 +48,12 @@
4448
this.exp_CurX = i;
4549
this.exp_CurValue = this.value_get(table[j][i]);
4650
current_event.Retrigger(current_frame,h);
47-
51+
4852
}
49-
}
53+
}
54+
p.Pop();
5055
}
51-
56+
5257
return false;
5358
}
5459
};

ported_plugins/plugins/rex_csv2array/source/cert.pem

Lines changed: 0 additions & 20 deletions
This file was deleted.

ported_plugins/plugins/rex_csv2array/source/key.pem

Lines changed: 0 additions & 28 deletions
This file was deleted.
Binary file not shown.

ported_plugins/plugins/rex_csv2dictionary/source/c3runtime/actions.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
{
88

99
var dict_obj = dict_objs.GetFirstPicked().GetSdkInstance();
10-
console.log(dict_obj);
1110
var table = CSVToArray(csv_string, this.strDelimiter);
1211
var i, cnt = table.length;
1312
if (cnt == 0){

ported_plugins/plugins/rex_csv2dictionary/source/c3runtime/conditions.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,27 @@
1111
return false;
1212
}
1313

14-
var current_frame = this._runtime.GetEventSheetManager().GetCurrentEventStackFrame();
15-
var current_event = current_frame.GetCurrentEvent();
16-
var solModifierAfterCnds = current_frame.IsSolModifierAfterCnds();
17-
var c = this._runtime.GetEventSheetManager().GetEventStack();
18-
var h = c.Push(current_event);
14+
var current_frame = this._runtime.GetEventSheetManager().GetCurrentEventStackFrame();
15+
var current_event = current_frame.GetCurrentEvent();
16+
var solmod = current_event.GetSolModifiers();
17+
var solModifierAfterCnds = current_frame.IsSolModifierAfterCnds();
18+
var c = this._runtime.GetEventSheetManager().GetEventStack();
19+
var p = this._runtime.GetEventStack();
20+
var h = c.Push(current_event);
1921
var entry, v;
2022
if (solModifierAfterCnds)
2123
{
2224
for (i=0; i<cnt; i++ )
2325
{
2426

25-
this._runtime.GetEventSheetManager().GetEventStack().PushCopySol(current_event.solModifiers);
27+
this._runtime.GetEventSheetManager().PushCopySol(solmod);
2628
entry = table[i];
2729
this.exp_CurKey = entry[0];
2830
this.exp_CurValue = this.value_get(entry[1]);
2931
current_event.Retrigger(current_frame,h);
30-
this._runtime.GetEventSheetManager().GetEventStack().PopSol(current_event.solModifiers);
31-
32-
}
32+
this._runtime.GetEventSheetManager().PopSol(solmod);
33+
}
34+
p.Pop();
3335
}
3436
else
3537
{
@@ -39,7 +41,8 @@
3941
this.exp_CurKey = entry[0];
4042
this.exp_CurValue = this.value_get(entry[1]);
4143
current_event.Retrigger(current_frame,h);
42-
}
44+
}
45+
p.Pop();
4346
}
4447

4548
return false;
32 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)