wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
wangzhenxing
|
8ecb6ee081
|
七界特权描述修改
|
2022-11-07 15:06:33 +08:00 |
wangzhenxing
|
396ca1a425
|
[洞府]=======洞府特权修改
|
2022-06-10 14:42:35 +08:00 |
wangzhenxing
|
57812ad22f
|
[功能]=======命石修改,建木神树修改
|
2022-03-29 15:28:56 +08:00 |
ZhangBiao
|
cbea9006b3
|
【家园】资源替换
|
2022-01-14 17:38:46 +08:00 |
ZhangBiao
|
60c31c1d5b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:20:19 +08:00 |
ZhangBiao
|
617a557071
|
【家园】修改按钮
|
2022-01-11 18:20:12 +08:00 |
ZhangBiao
|
9826244e7e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-01-11 18:19:02 +08:00 |
ZhangBiao
|
8d82a962a6
|
【家园】特效提交
|
2022-01-11 18:18:41 +08:00 |
ZhangBiao
|
e3c1c348e7
|
【家园】特权剩余时间修改
|
2022-01-11 13:29:58 +08:00 |
ZhangBiao
|
c40be4411d
|
【家园】特权时间显示跳帧
|
2022-01-10 18:22:20 +08:00 |
ZhangBiao
|
567f5c1aa0
|
【家园】升级倒计时显示错误修改
|
2022-01-10 17:38:02 +08:00 |
gaoxin
|
6ddd4c543f
|
【修为】修为点击问号,弹出鬼畜动画,当前是元婴期
|
2022-01-10 15:06:16 +08:00 |
ZhangBiao
|
c157985e24
|
【建木神树】调整
|
2022-01-08 11:36:31 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.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/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
893e33d920
|
【家园】提交
|
2022-01-06 10:33:08 +08:00 |
ZhangBiao
|
2f03bf5ab7
|
【家园】提交
|
2022-01-05 19:12:54 +08:00 |
ZhangBiao
|
aa761fc4e9
|
【家园】提交
|
2022-01-05 18:04:57 +08:00 |
ZhangBiao
|
b45f74781c
|
【家园】提交
|
2022-01-05 17:06:34 +08:00 |
ZhangBiao
|
6f4942e87e
|
【家园】提交
|
2022-01-05 16:21:20 +08:00 |
ZhangBiao
|
f0de43aad2
|
【家园】提交
|
2022-01-05 14:17:53 +08:00 |
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 |
jiaoyangna
|
5c51490cf5
|
探索提交
|
2021-12-29 10:33:12 +08:00 |
jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# 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/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
jiaoyangna
|
130a75c8dd
|
探索提交
|
2021-12-24 00:14:32 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
jiaoyangna
|
d2271d89b6
|
探索提交
|
2021-12-22 12:07:00 +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 |