JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +08:00 |
jiaoyangna
|
88e59e0c7c
|
lua 提交
|
2021-03-02 15:49:02 +08:00 |
jiaoyangna
|
e4f4649cf9
|
文本提交
|
2021-02-20 18:01:57 +08:00 |
jiaoyangna
|
629971d137
|
文本还原提交
|
2021-02-20 16:55:28 +08:00 |
guowei
|
8d59355692
|
【鸿蒙阵bug修改】
|
2021-01-12 16:29:14 +08:00 |
guowei
|
83316e4724
|
【鸿蒙阵协议】
|
2021-01-07 15:31:33 +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 |
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 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
ZhangBiao
|
1431423c4f
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-18 11:39:01 +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 |
zhangqiang
|
3bbaab27be
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:21 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
ZhangBiao
|
a2c8352e29
|
装备文字过长、仙缘宝箱优化、充值妖晶提示问题
|
2020-08-28 18:37:16 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +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 |
ZhangBiao
|
dd06fc4652
|
充值入口恢复,加 充值switch
|
2020-07-31 13:35:15 +08:00 |
ZhangBiao
|
44ace7a129
|
充值入口恢复
|
2020-07-31 10:33:05 +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 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +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
|
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 |