Merge branch 'main' into 1.4.0-dev

This commit is contained in:
FigmentBoy 2023-10-20 21:25:02 -04:00
commit 100ebbaff8
No known key found for this signature in database
GPG key ID: DAC9B296323BFA9B

View file

@ -267,7 +267,7 @@ class ButtonSprite : cocos2d::CCSprite {
void updateBGImage(const char*) = mac 0x502d0, win 0x13af0;
static ButtonSprite* create(char const*, float) = mac 0x4fa60;
void setString(const char* txt) = mac 0x4fec0, win 0x14030;
void updateSpriteBGSize() = win 0x13c00;
void updateSpriteBGSize() = mac 0x4f5d0, win 0x13c00;
void setColor(cocos2d::ccColor3B color) = mac 0x50410, win 0x143e0;
PAD = mac 0x18, win 0x18;
@ -275,7 +275,7 @@ class ButtonSprite : cocos2d::CCSprite {
cocos2d::CCSprite* m_subSprite;
cocos2d::CCSprite* m_subBGSprite;
cocos2d::extension::CCScale9Sprite* m_BGSprite;
PAD = win 0x8;
PAD = mac 0xC, win 0x8;
cocos2d::CCPoint m_spritePosition;
}
@ -1306,6 +1306,7 @@ class EditButtonBar : cocos2d::CCNode {
int rowCount, int columnCount
) = mac 0x350e60, win 0x6e450;
bool init(cocos2d::CCArray* buttons, int, bool, int rowCount, int columnCount, cocos2d::CCPoint pos) = win 0x6e550;
cocos2d::CCPoint m_position;
int m_unknown;
bool m_unknownBool;
@ -1484,6 +1485,7 @@ class EditorUI : cocos2d::CCLayer, FLAlertLayerProtocol, ColorSelectDelegate, GJ
void editGroup(cocos2d::CCObject* sender) = win 0x8d720;
void moveObjectCall(cocos2d::CCObject* sender) = mac 0x29830, win 0x8db30;
void moveObjectCall(EditCommand command) = mac 0x29b80, win 0x8db50;
cocos2d::CCPoint* moveForCommand(cocos2d::CCPoint* point, EditCommand command) = win 0x8d890;
void transformObjectCall(cocos2d::CCObject* sender) = mac 0x29860, win 0x8def0;
void transformObjectCall(EditCommand command) = mac 0x29d90, win 0x8df10;
void transformObject(GameObject* obj, EditCommand command, bool snap) = mac 0x2b0b0, win 0x8e250;
@ -1518,8 +1520,8 @@ class EditorUI : cocos2d::CCLayer, FLAlertLayerProtocol, ColorSelectDelegate, GJ
void onPasteState(cocos2d::CCObject* sender) = mac 0x19ee0, win 0x884c0;
void onGroupSticky(cocos2d::CCObject* sender) = mac 0xc180, win 0x87a80;
void onUngroupSticky(cocos2d::CCObject* sender) = mac 0xc1d0, win 0x87ac0;
void onGoToLayer(cocos2d::CCObject* sender) = win 0x886b0;
void onGoToBaseLayer(cocos2d::CCObject* sender) = win 0x88790;
void onGoToLayer(cocos2d::CCObject* sender) = mac 0x19fa0, win 0x886b0;
void onGoToBaseLayer(cocos2d::CCObject* sender) = mac 0x1a270, win 0x88790;
void onToggleGuide(cocos2d::CCObject* sender) = mac 0x19da0, win 0x79160;
void editColor(cocos2d::CCObject* sender) = mac 0x19190, win 0x8d3c0;
void alignObjects(cocos2d::CCArray* objs, bool alignY) = mac 0x2cea0, win 0x8f320;
@ -1821,7 +1823,7 @@ class FLAlertLayer : cocos2d::CCLayerColor {
cocos2d::ccColor3B m_color2;
ButtonSprite* m_button1;
ButtonSprite* m_button2;
cocos2d::CCLayerColor* m_scrollingLayer;
ScrollingLayer* m_scrollingLayer;
int m_joystickConnected;
bool m_containsBorder;
bool m_noAction;
@ -5519,6 +5521,11 @@ class RingObject : EffectGameObject {
[[link(android)]]
class ScrollingLayer : cocos2d::CCLayerColor {
static ScrollingLayer* create(cocos2d::CCSize, cocos2d::CCPoint, float) = mac 0x41a900, win 0x2d8e0;
PAD = win 0x28;
float m_layerHeight;
PAD = win 0x4;
cocos2d::CCLayer* m_scrollLayer;
cocos2d::CCNode* m_parent;
}
[[link(android)]]