zhangqiang
|
005f36c524
|
【灵兽系统】 修改bug
|
2020-10-31 14:49:58 +08:00 |
zhangqiang
|
1d768be6b3
|
【灵兽系统】 拖拽层级错误修改
|
2020-10-30 13:48:14 +08:00 |
zhangqiang
|
c22b0d34d5
|
【灵兽系统】 红点刷新
|
2020-10-29 16:58:00 +08:00 |
zhangqiang
|
5d2bfdc46b
|
【灵兽系统】 动画调整
|
2020-10-29 15:37:19 +08:00 |
zhangqiang
|
17465d4d99
|
【灵兽系统】 bug
|
2020-10-29 11:01:03 +08:00 |
zhangqiang
|
afed2cad3b
|
【灵兽系统】 bug
|
2020-10-28 16:31:08 +08:00 |
zhangqiang
|
e60d24f9a3
|
【灵兽系统】 修改bug
|
2020-10-28 11:48:36 +08:00 |
zhangqiang
|
8070a4fa47
|
【灵兽系统】 星级居中修改
|
2020-10-28 10:35:50 +08:00 |
zhangqiang
|
a20217223a
|
【灵兽系统】 添加碎片合成红点
|
2020-10-27 17:02:37 +08:00 |
zhangqiang
|
0d9ed28c23
|
【灵兽系统】 资源替换 拖拽修改
|
2020-10-27 15:59:53 +08:00 |
JieLing
|
ef4f4232cb
|
【灵兽系统】 修改显示 排行榜显示修改
|
2020-10-26 18:04:45 +08:00 |
zhangqiang
|
388cb8a418
|
【灵兽系统】 修改合成逻辑
|
2020-10-26 17:23:08 +08:00 |
zhangqiang
|
35f64de903
|
【灵兽系统】 修改预设加载
|
2020-10-26 17:11:04 +08:00 |
zhangqiang
|
aff128d50a
|
灵兽提交
|
2020-10-24 19:46:10 +08:00 |
zhangqiang
|
1d67775000
|
灵兽提交
|
2020-10-24 18:14:00 +08:00 |
zhangqiang
|
3d72b9c0ea
|
灵兽提交 添加羁绊红点预设
|
2020-10-24 16:11:58 +08:00 |
zhangqiang
|
7a4cd7ba8f
|
零售品升级升星红点
|
2020-10-24 14:15:35 +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
|
eb153fdaa6
|
灵兽提交
|
2020-10-22 16:13:44 +08:00 |
zhangqiang
|
74858bdbe7
|
灵兽提交
|
2020-10-21 15:40:23 +08:00 |
zhangqiang
|
f8d6c63368
|
灵兽提交 上阵提交
|
2020-10-21 11:58:16 +08:00 |
zhangqiang
|
3a6c14f607
|
灵兽提交
|
2020-10-20 20:18:02 +08:00 |
zhangqiang
|
c6f34794f3
|
灵兽提交
|
2020-10-20 16:08:51 +08:00 |
zhangqiang
|
086292c67e
|
提交
|
2020-10-19 18:28:29 +08:00 |
wangzhenxing
|
711986c6a9
|
Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
|
2020-10-17 14:11:47 +09:00 |
wangzhenxing
|
bd4f93309f
|
灵兽涅槃,召唤,商店提交
|
2020-10-17 14:11:34 +09:00 |
zhangqiang
|
179242de4c
|
提交
|
2020-10-16 16:50:27 +08:00 |
zhangqiang
|
b93d7d0435
|
提交
|
2020-10-15 15:43:35 +08:00 |
zhangqiang
|
c939bab156
|
提交
|
2020-10-13 19:14:34 +08:00 |
zhangqiang
|
f28501a893
|
提交
|
2020-10-13 16:32:50 +08:00 |
zhangqiang
|
bf2804f080
|
提交
|
2020-10-13 13:56:41 +08:00 |
zhangqiang
|
637d910b5c
|
灵 受
|
2020-09-25 18:41:07 +08:00 |
zhangqiang
|
f40b2050ad
|
灵兽培养部分初始脚本
|
2020-09-25 14:48:10 +08:00 |