ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
19c27ae7bb
|
【家园】提交
|
2022-01-05 10:12:23 +08:00 |
ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
ZhangBiao
|
14044932b5
|
【命格】属性加成报错修改
|
2022-01-04 16:57:52 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
ZhangBiao
|
39244f8ce5
|
【家园】特权完成,2021最后的提交!!
|
2021-12-31 18:58:04 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
gaoxin
|
d1b84299c2
|
【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
|
2022-01-03 02:43:00 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
ZhangBiao
|
f067ae5080
|
【命格】提交
|
2021-12-10 11:40:15 +08:00 |
ZhangBiao
|
7bcc95f31f
|
【命格】提交
|
2021-12-08 18:34:56 +08:00 |
ZhangBiao
|
655021fe3f
|
【命格】战力升降显示
|
2021-12-08 18:21:28 +08:00 |
ZhangBiao
|
4f1e129473
|
【命格】加成预览提交
|
2021-12-08 17:27:22 +08:00 |
ZhangBiao
|
984bb12611
|
【主角修为】问号文字调整
|
2021-10-21 11:14:24 +08:00 |
ZhangBiao
|
205200268d
|
【主角修为】提交
|
2021-10-21 10:58:09 +08:00 |
ZhangBiao
|
6a3c9ccd25
|
【主角修为】问号提交
|
2021-10-20 18:35:30 +08:00 |
ZhangBiao
|
32585cec01
|
【七界试炼】增加怪物详情界面
|
2021-09-22 19:38:16 +08:00 |
yuanshuai
|
db18313495
|
Merge branch '0功能/四象心法' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
# Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto.proto
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/ChatProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.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/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-22 15:12:32 +08:00 |
yuanshuai
|
b0c69c81a8
|
【四象心法】技能加成bug修改
|
2021-09-17 15:18:50 +08:00 |
yuanshuai
|
a54cd46bc4
|
【四象心法】添加技能属性加成脚本
|
2021-09-14 11:37:34 +08:00 |
ZhangBiao
|
c68496654f
|
【七界试炼】遗物
|
2021-09-13 13:54:58 +08:00 |
ZhangBiao
|
8c9f31f028
|
【七界试炼】遗物
|
2021-09-13 11:42:14 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
ZhangBiao
|
2fe984719b
|
【七界试炼】遗物1/2
|
2021-09-08 16:26:40 +08:00 |
ZhangBiao
|
1693300255
|
【七界试炼】目标特性
|
2021-09-08 10:06:24 +08:00 |
ZhangBiao
|
3f7e243b70
|
【修行】this.spLoader提交
|
2021-05-20 09:48:52 +08:00 |
ZhangBiao
|
e491f58adc
|
【修行】提交
|
2021-05-19 16:14:09 +08:00 |
ZhangBiao
|
bcf845ae38
|
【修行】玩家信息界面怎加技能详情
|
2021-05-18 16:13:26 +08:00 |