ZhangBiao
|
5ffab2b82a
|
【跳转返回】道具跳转后返回关闭道具详情界面
|
2021-01-14 17:07:45 +08:00 |
guowei
|
a25db7d09c
|
【鸿蒙阵bug修改】
|
2021-01-14 14:09:13 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
guowei
|
8d59355692
|
【鸿蒙阵bug修改】
|
2021-01-12 16:29:14 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
13767fd26e
|
Merge branch 'master_xma_local' into gx/xma_local
|
2021-01-12 10:56:36 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
ZhangBiao
|
c1c057176a
|
【车迟斗法】副本页签红点刷新不及时 修改
(cherry picked from commit ecbcdc2614)
|
2021-01-11 19:46:11 +08:00 |
ZhangBiao
|
ecbcdc2614
|
【车迟斗法】副本页签红点刷新不及时 修改
|
2021-01-11 14:54:32 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
guowei
|
3ded7b31fc
|
【鸿蒙阵修改】
|
2021-01-08 17:29:54 +08:00 |
guowei
|
83316e4724
|
【鸿蒙阵协议】
|
2021-01-07 15:31:33 +08:00 |
guowei
|
6c191263bd
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Expedition.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
|
2021-01-06 20:05:35 +08:00 |
jiaoyangna
|
c1c15d6c8b
|
四灵试炼
|
2021-01-04 11:39:58 +08:00 |
JieLing
|
af7e202ea9
|
【优化】部分界面动画效果优化
|
2020-12-30 19:51:14 +08:00 |
JieLing
|
e8ea367a6e
|
【优化】scrollview setData不是回到顶部时不再播放动画
|
2020-12-30 16:45:52 +08:00 |
JieLing
|
ef3c269876
|
【优化】scrollview SetData接口默认回到顶部
|
2020-12-30 15:55:46 +08:00 |
JieLing
|
f3c1a2297a
|
【bug】修复scrollview修改导致引导报错的问题
|
2020-12-30 14:41:27 +08:00 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
gaoxin
|
962c41e11c
|
【优化】scrollview改为分帧加载
|
2020-12-29 20:35:28 +08:00 |
guowei
|
b406886f91
|
【鸿蒙阵bug修改】
|
2020-12-28 10:44:31 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
guowei
|
d36276eb0c
|
【鸿蒙阵修改】
|
2020-12-26 15:07:51 +08:00 |
jiaoyangna
|
cb5e374ebf
|
冲突提交
|
2020-12-24 16:49:53 +08:00 |
ZhangBiao
|
28a3341fa1
|
【增加跳转】化灵符跳转零售特惠
(cherry picked from commit bc582d93e0)
|
2020-12-24 16:43:22 +08:00 |
guowei
|
b09bf01c54
|
【鸿蒙阵bug修改】
|
2020-12-24 16:16:53 +08:00 |
guowei
|
2ac574ff06
|
【鸿蒙阵bug】更新
|
2020-12-23 17:41:31 +08:00 |
ZhangBiao
|
8801a84c2b
|
【新将活动】商店跳转修复
|
2020-12-23 17:28:20 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
jiaoyangna
|
27568171e5
|
[四灵] 提交
|
2020-12-22 20:33:35 +08:00 |
guowei
|
0dd211f896
|
【鸿蒙阵】更新
|
2020-12-22 15:41:45 +08:00 |
guowei
|
8a0574cb6a
|
【鸿蒙阵】
|
2020-12-22 11:06:23 +08:00 |
guowei
|
314665aa2d
|
【鸿蒙阵修改】
|
2020-12-21 15:10:23 +08:00 |
ZhangBiao
|
1431423c4f
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-18 11:39:01 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
ZhangBiao
|
45b8899cfe
|
【建木神树】排行榜查看其他人信息
|
2020-12-16 13:49:56 +08:00 |
guowei
|
861b02f0c8
|
【鸿蒙阵初版】
|
2020-12-15 11:03:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
15eebe4584
|
【鸿蒙阵】 初版提交
|
2020-11-27 17:59:25 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
gaoxin
|
5a861ade95
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:01:31 +08:00 |
gaoxin
|
d00d3e803c
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:58 +08:00 |
gaoxin
|
34b4b5db51
|
【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
|
2020-11-02 22:55:24 +08:00 |
zhangqiang
|
3bbaab27be
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:21 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
JieLing
|
48bf02ce81
|
【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店
|
2020-10-27 19:29:35 +08:00 |
gaoxin
|
9add8d8dbf
|
【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
|
2020-10-27 13:53:32 +08:00 |
zhangqiang
|
42f0f9b5fe
|
修复三界降魔头像框点击无反应
|
2020-09-30 10:34:07 +08:00 |
gaoxin
|
bf3641d6c3
|
物品框添加头像框的特效
|
2020-09-27 16:58:21 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
gaoxin
|
701db5bb17
|
充值接口修改,sdk和本地走同一套接口
|
2020-09-09 20:13:23 +08:00 |
jiaoyangna
|
5a861862d5
|
商店添加动画
|
2020-09-04 16:54:58 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
zhangqiang
|
939e9b3c77
|
shi pei
|
2020-09-02 15:54:28 +08:00 |
ZhangBiao
|
a2c8352e29
|
装备文字过长、仙缘宝箱优化、充值妖晶提示问题
|
2020-08-28 18:37:16 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |
shihongyi
|
e797e9f48d
|
合并develop &2 进程中,暂时不要更新
|
2020-08-12 11:37:26 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
gaoxin
|
b257aa2eef
|
dragview回滚
|
2020-08-03 21:08:38 +08:00 |
jiaoyangna
|
3ff95a1796
|
fix bug
|
2020-08-03 17:23:28 +08:00 |
ZhangBiao
|
0cd5ffca9d
|
魂印特效关闭
|
2020-08-03 16:11:04 +08:00 |
ZhangBiao
|
434aaeccff
|
魂印特效 无用log删除
|
2020-08-03 15:20:18 +08:00 |
jiaoyangna
|
242896fede
|
add soulprint effect commit
|
2020-08-02 09:16:45 +08:00 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
ZhangBiao
|
44ace7a129
|
充值入口恢复
|
2020-07-31 10:33:05 +08:00 |
jiaoyangna
|
1b2a752871
|
effect update
|
2020-07-30 16:37:58 +08:00 |
jiaoyangna
|
b6578e618e
|
effect update
|
2020-07-30 16:27:17 +08:00 |
jiaoyangna
|
d00afc69cf
|
添加特效
|
2020-08-06 15:14:47 +08:00 |
zhangqiang
|
74b9cc5c55
|
成员红点检测 巅峰战编队入口显示修复
|
2020-08-11 00:08:56 +08:00 |
jiaoyangna
|
5d70187da8
|
副本修改提交
|
2020-07-28 20:51:28 +08:00 |
ZhangBiao
|
018adbe85d
|
天宫秘宝入口关闭,修改乾坤宝盒魂印弹窗
|
2020-07-28 17:01:48 +08:00 |
jiaoyangna
|
1802487345
|
itemview update
|
2020-07-25 20:56:23 +08:00 |
jiaoyangna
|
d8fa2b9459
|
头像背景修改
|
2020-07-25 19:59:43 +08:00 |
jiaoyangna
|
0c2239bd11
|
编队修改提交
|
2020-07-25 13:21:30 +08:00 |
jiaoyangna
|
caadda04e1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
|
2020-07-24 20:04:44 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
ZhangBiao
|
4945f99452
|
--(24暂时关闭)
|
2020-07-24 18:30:26 +08:00 |
ZhangBiao
|
d398804a83
|
--(24暂时关闭)
|
2020-07-24 16:38:04 +08:00 |
ZhangBiao
|
b3ddd8fc96
|
|
2020-07-24 15:22:17 +08:00 |
ZhangBiao
|
f7424e83ca
|
元素共鸣
|
2020-07-24 10:30:33 +08:00 |
jiaoyangna
|
4af617da49
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-23 15:43:23 +08:00 |
jiaoyangna
|
aefa2b0cac
|
添加一个万象境的入口列表
|
2020-07-23 15:42:42 +08:00 |
ZhangBiao
|
e266292288
|
关卡掉落装备显示问题修复
|
2020-07-23 11:19:27 +08:00 |
zhangqiang
|
264f0b7323
|
bug
|
2020-07-17 15:14:15 +08:00 |
zhangqiang
|
25896729ff
|
商店去掉刷新红点
|
2020-07-17 11:32:20 +08:00 |
gaoxin
|
db1118aa9c
|
修复打包后不能充值得bug
|
2020-07-13 16:48:50 +08:00 |
jiaoyangna
|
fdf82e47ac
|
分解、重置相关功能修改
|
2020-07-11 18:00:07 +08:00 |
JieLing
|
b3c70f66e4
|
svn逻辑tongbu
|
2020-07-01 18:14:03 +08:00 |
JieLing
|
5154fdbac0
|
外网0.16.14 内网0.15.25
|
2020-07-01 09:40:20 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
75a3f83194
|
内网0.15.16 外网 0.16.7
|
2020-06-19 20:19:35 +08:00 |
JieLing
|
e189462ac9
|
内网测试 0.15.14
|
2020-06-18 20:39:29 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
b499b77bbe
|
外网0.16.4版本热更
|
2020-06-08 13:57:30 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |