Fuhaifeng
|
5d00d1adf0
|
BtView 事件防止注入
|
2020-12-18 13:56:58 +08:00 |
Fuhaifeng
|
1c89a5c8cd
|
Kua脚本优化。UI框架,RoleList Bag 协程加载。 UIManager1,2,3,4
|
2020-12-17 19:39:52 +08:00 |
Fuhaifeng
|
b3eb231d0b
|
no message
|
2020-12-15 19:18:00 +08:00 |
gaoxin
|
9eaf7f8d6b
|
【战斗】修复回收机制错误,导致立绘重叠的问题,删除无用log
|
2020-12-03 11:44:57 +08:00 |
gaoxin
|
5ab9688089
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-16 16:46:33 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
73c94dee90
|
Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_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 17:34:27 +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
|
5070d78a79
|
【商店】前端从表里判断商品的显示状态添加
|
2020-11-03 18:00:53 +08:00 |
gaoxin
|
d00d3e803c
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:58 +08:00 |
gaoxin
|
b634b81590
|
【商店】删除商店的动画显示
|
2020-11-03 01:00:27 +08:00 |
gaoxin
|
34b4b5db51
|
【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
|
2020-11-02 22:55:24 +08:00 |
gaoxin
|
ad4d9bdce1
|
【商店】修复灵兽山跳转灵兽商店会显示其他商店的数据的问题
|
2020-11-02 22:51:36 +08:00 |
zhangqiang
|
d0a8e96d5e
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:44 +08:00 |
zhangqiang
|
3bbaab27be
|
【灵兽系统】 添加驱灵币跳转按钮 and 特权礼包排序
|
2020-11-02 14:36:21 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
4d4cd55010
|
【灵兽系统】 bug
|
2020-10-28 19:49:14 +08:00 |
zhangqiang
|
0f5583e0f9
|
【灵兽系统】bug 修改
|
2020-10-28 17:57:30 +08:00 |
zhangqiang
|
3fcc213718
|
【灵兽系统】 问题修改
|
2020-10-28 15:27:43 +08:00 |
wangzhenxing
|
132c49a807
|
[灵兽] 灵兽策划反馈bug修改
|
2020-10-28 10:17:20 +09:00 |
JieLing
|
8b22166237
|
【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店
|
2020-10-28 07:48:30 +08:00 |
JieLing
|
48bf02ce81
|
【商店】 商店显示商品报错 步骤 月卡 激活 返回来 再点激活跳转商店
|
2020-10-27 19:29:35 +08:00 |
gaoxin
|
9add8d8dbf
|
【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
|
2020-10-27 13:53:32 +08:00 |
gaoxin
|
6292afc225
|
【商店】修复ShopView销毁时会导致其他shopview物品回收的问题(修复商店偶现物品消失的问题)
|
2020-10-27 12:02:28 +08:00 |
zhangqiang
|
2cf881c4d5
|
灵兽提交
|
2020-10-23 15:12:21 +08:00 |
zhangqiang
|
6767828cdc
|
Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/Spine/ls_06_baize.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
# Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2020-10-23 14:38:50 +08:00 |
zhangqiang
|
3a6c14f607
|
灵兽提交
|
2020-10-20 20:18:02 +08:00 |
wangzhenxing
|
4e047140a8
|
灵兽提交
|
2020-10-20 16:17:08 +09:00 |
zhangqiang
|
034230ffc9
|
提交
|
2020-10-19 16:57:30 +08:00 |
wangzhenxing
|
45be005e63
|
灵兽抽卡放生功能提交
|
2020-10-15 20:27:41 +09:00 |
zhangqiang
|
756db024dc
|
修复三界降魔头像框点击无反应
(cherry picked from commit 42f0f9b5fe)
|
2020-10-12 12:13:03 +08:00 |
gaoxin
|
36ebddb517
|
物品框添加头像框的特效
|
2020-09-27 15:04:12 +08:00 |
gaoxin
|
525e229273
|
部分界面头像特效添加
|
2020-09-27 13:33:10 +08:00 |
gaoxin
|
70a575cbb3
|
部分界面不再常驻内存
|
2020-09-10 14:25:02 +08:00 |
gaoxin
|
64f382c54d
|
充值接口修改,sdk和本地走同一套接口
|
2020-09-09 18:47:17 +08:00 |
gaoxin
|
b9481babee
|
部分界面音效添加
|
2020-09-09 13:59:22 +08:00 |
jiaoyangna
|
53524225f9
|
动画添加提交
|
2020-09-08 10:09:21 +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 |
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 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
ZhangBiao
|
dd3c814c2a
|
四元阵中 添加 置换入口
|
2020-08-13 14:43:10 +08:00 |