wangzhenxing
|
e498661919
|
神印添加背包分解
|
2022-04-24 16:36:27 +08:00 |
yuanshuai
|
765134f4b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
|
2022-04-22 18:33:04 +08:00 |
yuanshuai
|
c3919b7e82
|
变身卡强化相关代码提交
|
2022-04-22 18:24:33 +08:00 |
wangzhenxing
|
ca2b699259
|
神印提交
|
2022-04-22 18:23:01 +08:00 |
ZhangBiao
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
gaoxin
|
cb8f8fe0aa
|
【挂机物品】添加时间标签
|
2021-12-26 17:13:30 +08:00 |
ZhangBiao
|
56aad6a959
|
【命格】提交
|
2021-12-14 17:52:15 +08:00 |
ZhangBiao
|
181e5dcb63
|
【命格】背包页签位置
|
2021-12-14 17:19:22 +08:00 |
ZhangBiao
|
bf46f1a6f6
|
【命格】提交
|
2021-12-14 15:55:47 +08:00 |
ZhangBiao
|
85dfd5c299
|
【命格】提交
|
2021-12-14 15:31:30 +08:00 |
ZhangBiao
|
d91811a555
|
【命格】提交
|
2021-12-13 17:26:08 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
ZhangBiao
|
cb5cf43089
|
【命格】提交
|
2021-12-09 20:17:37 +08:00 |
ZhangBiao
|
9875630085
|
【命格】提交
|
2021-12-09 13:29:16 +08:00 |
ZhangBiao
|
016780c7bc
|
【命格】命石替换
|
2021-12-08 14:17:18 +08:00 |
ZhangBiao
|
00f0e12f28
|
【命格】背包中显示
|
2021-12-07 14:03:02 +08:00 |
gaoxin
|
b10dad4285
|
【法宝聚灵】背包和掉落界面不显示碎片框
|
2021-11-22 12:01:16 +08:00 |
gaoxin
|
f78031984a
|
【背包】法宝聚灵页签添加
|
2021-11-22 11:18:28 +08:00 |
ZhangBiao
|
f18880622e
|
【新·魂灵宝】提交
|
2021-11-09 17:06:47 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
gaoxin
|
44415cfded
|
【坐骑】获取新坐骑,点击前往,展示新坐骑
|
2021-11-02 16:42:36 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
jiaoyangna
|
32a38b6053
|
【ID1018679】
【好感度】礼物图标在背包没阵营标记
|
2021-10-09 11:39:09 +08:00 |
ZhangBiao
|
1e17301cc8
|
【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能
|
2021-09-16 16:16:50 +08:00 |
zhangshanxue
|
c3dd7b40c4
|
Merge branch 'china/test' into china/xq
|
2021-09-06 19:24:18 +08:00 |
gaoxin
|
0febc6ae6a
|
【背包】修复滑动后切换页签不回到最顶部的 问题
|
2021-09-06 19:23:56 +08:00 |
jiaoyangna
|
cd594275e0
|
四灵试炼修改提交
|
2021-08-26 17:25:02 +08:00 |
gaoxin
|
1d739a9d9d
|
【物品特效】魂印各界面显示修改
|
2021-07-09 18:28:18 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
gaoxin
|
206fcf9d92
|
【红点】修复部分红点被错误清除的问题
|
2021-06-04 23:54:59 +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 |
gaoxin
|
868643f87c
|
【spLoader】处理一些白片问题
|
2021-04-22 18:26:48 +08:00 |
gaoxin
|
43afe3d6f1
|
【内存】btview可能会导致重复卸载资源的问题
|
2021-04-22 13:40:04 +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 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
gaoxin
|
6e34c88fa5
|
【人物信息栏】修复战力刷新不及时的问题
|
2021-03-30 20:46:47 +08:00 |
gaoxin
|
3cc0b51edd
|
【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题
|
2021-03-30 18:42:30 +08:00 |
zhangqiang
|
82b1de6537
|
【称号坐骑时装】飘战力 快捷跳转
|
2021-03-30 17:17:11 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +08:00 |