ZhangBiao
|
a9b7c21fad
|
【道具弹窗】跳转按钮错位
|
2021-12-17 17:13:45 +08:00 |
gaoxin
|
eaea265bc7
|
【物品】添加物品使用的限制等级
|
2021-12-26 17:35:50 +08:00 |
jiaoyangna
|
1ae167efb5
|
至尊降世修改提交
|
2021-12-16 16:55:30 +08:00 |
gaoxin
|
973eee4b30
|
【物品】添加新物品类型
|
2021-12-25 07:58:30 +08:00 |
gaoxin
|
d14c0fe589
|
【ID1010850】首充豪礼100元档去除
|
2021-12-24 17:49:17 +08:00 |
jiaoyangna
|
12fb7447cc
|
坐骑合成修改
|
2021-11-30 13:23:29 +08:00 |
gaoxin
|
cd291429f1
|
【坐骑碎片合成】删除无用代码
|
2021-11-18 16:05:26 +08:00 |
gaoxin
|
77c3376d82
|
【坐骑碎片合成】
|
2021-11-18 16:03:34 +08:00 |
ZhangBiao
|
cc316086e9
|
【新·物品】界面提交
|
2021-11-10 15:03:18 +08:00 |
ZhangBiao
|
f74ce2f895
|
【新·物品】界面提交
|
2021-11-10 14:53:35 +08:00 |
gaoxin
|
5f0dc622a5
|
【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面
|
2021-11-08 15:12:48 +08:00 |
gaoxin
|
89957b0787
|
【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次
|
2021-11-05 17:12:35 +08:00 |
gaoxin
|
44415cfded
|
【坐骑】获取新坐骑,点击前往,展示新坐骑
|
2021-11-02 16:42:36 +08:00 |
ZhangBiao
|
79f7339a3a
|
【三界降魔】提交
|
2021-10-28 16:03:23 +08:00 |
ZhangBiao
|
31e8f4c726
|
【弹窗优化】物品信息、自选箱、排行榜、限时活动奖励弹窗
|
2021-10-22 13:22:39 +08:00 |
jiaoyangna
|
c091c55bef
|
【ID1010437】
【优化】开服玉帝御剑坐骑活动
|
2021-10-19 11:04:06 +08:00 |
gaoxin
|
29d1b095e5
|
【碎片详情】碎片详情添加灵兽和神将的查看-特殊碎片不显示查看按钮
|
2021-09-08 18:28:50 +08:00 |
gaoxin
|
79832f3232
|
【碎片详情】碎片详情添加灵兽和神将的查看
|
2021-09-07 11:40:12 +08:00 |
jiaoyangna
|
763c45ebd0
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
(cherry picked from commit 7371405fbd )
|
2021-07-12 11:16:54 +08:00 |
jiaoyangna
|
a233fb2c7d
|
【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
(cherry picked from commit 4d588e2948 )
|
2021-07-12 10:19:54 +08:00 |
jiaoyangna
|
fa30243bf5
|
玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0 )
|
2021-07-08 18:30:29 +08:00 |
jiaoyangna
|
82f1650edf
|
神将来源定位描述错误修改
|
2021-07-02 12:11:29 +08:00 |
jiaoyangna
|
9b01d308e8
|
孙悟空添加新人商城
|
2021-07-02 11:13:59 +08:00 |
jiaoyangna
|
4f34d6ed42
|
神将来源返回时打开
|
2021-07-01 18:12:20 +08:00 |
jiaoyangna
|
8b187bfd5f
|
获取途径报错修改
|
2021-07-01 15:27:04 +08:00 |
jiaoyangna
|
36cb3db3af
|
底图修改提交
|
2021-06-30 16:17:50 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
jiaoyangna
|
e44449391d
|
神将来源修改提交
|
2021-06-30 15:47:13 +08:00 |
jiaoyangna
|
b5324c165a
|
神将来源碎皮合成修改提交
|
2021-06-30 15:27:27 +08:00 |
jiaoyangna
|
ed1cf199a2
|
神将来源修改
|
2021-06-30 11:50:11 +08:00 |
jiaoyangna
|
58994f5a38
|
神将来源修改
|
2021-06-30 11:42:22 +08:00 |
jiaoyangna
|
6429cba1d4
|
代码报错修改
|
2021-06-30 11:37:33 +08:00 |
jiaoyangna
|
de0b9be884
|
添加首充和至尊降世的 显示
|
2021-06-30 11:36:07 +08:00 |
jiaoyangna
|
f834e2e17d
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-30 10:12:44 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
ZhangBiao
|
9ebd4c5e05
|
【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面
|
2021-05-31 18:00:42 +08:00 |
zhangqiang
|
028a31941f
|
【背包】背包中道具详情没有“使用”按钮
|
2021-05-29 20:44:43 +08:00 |
zhangqiang
|
fe6b69bfe6
|
【bug】提交
|
2021-05-28 10:32:42 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
ZhangBiao
|
9fda08c7ba
|
【碎片合成】神将达上限,选择合成数量时没有合理提示
|
2021-05-08 11:03:46 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
zhangqiang
|
de76c697c4
|
【英雄升星祭品】提交——01
|
2021-04-19 13:46:24 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |