xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
wangzhenxing
|
df07616ab3
|
变身卡修改提交
|
2023-05-31 17:21:13 +08:00 |
wangzhenxing
|
1f94c3d234
|
变身卡添加职业
|
2023-04-21 13:24:26 +08:00 |
wangzhenxing
|
d2af9edc0f
|
[gm]======变身卡修改提交
|
2022-11-02 11:48:41 +08:00 |
wangzhenxing
|
054c31caee
|
[周卡]=====红点提交
|
2022-06-01 13:23:34 +08:00 |
yuanshuai
|
0805e5054d
|
身外化身界面调整
|
2022-04-28 11:58:48 +08:00 |
yuanshuai
|
d1111be7eb
|
化身卡升级升星红点提交
|
2022-04-27 18:08:55 +08:00 |
yuanshuai
|
4199ea504a
|
查看其他玩家信息,变身卡信息不对bug
|
2022-04-26 17:20:19 +08:00 |
yuanshuai
|
f187acdf52
|
化身属性显示不对bug修改
|
2022-04-26 14:21:24 +08:00 |
yuanshuai
|
92e56472de
|
天宫商店点击报错 bug修改
|
2022-04-26 10:14:52 +08:00 |
yuanshuai
|
4e5ccff820
|
身外化身界面调整
|
2022-04-25 14:42:17 +08:00 |
yuanshuai
|
26970aee68
|
身外化身功能提交
|
2022-04-24 16:50:24 +08:00 |
yuanshuai
|
765134f4b3
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
|
2022-04-22 18:33:04 +08:00 |
yuanshuai
|
c3919b7e82
|
变身卡强化相关代码提交
|
2022-04-22 18:24:33 +08:00 |
wangzhenxing
|
e025824de6
|
添加报错处理
|
2022-04-22 13:17:58 +08:00 |
wangzhenxing
|
61a52f4239
|
[变身卡]=======处理变身卡报错
|
2022-04-21 17:23:57 +08:00 |
jiaoyangna
|
709f125845
|
商店修改
|
2021-12-06 15:43:05 +08:00 |
jiaoyangna
|
fefd3a7fd5
|
变身卡修改提交
|
2021-12-06 14:51:13 +08:00 |
jiaoyangna
|
ab722baa35
|
变身卡修改提交
|
2021-12-06 14:05:43 +08:00 |
jiaoyangna
|
9070ad04ca
|
化身属性排序修改
|
2021-11-29 14:45:23 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
jiaoyangna
|
b78e2335fa
|
身外化身提交
|
2021-11-26 11:34:25 +08:00 |
jiaoyangna
|
c0c8a6710c
|
身外化身提交
|
2021-11-26 11:08:48 +08:00 |
jiaoyangna
|
efe7866916
|
身外化身添加属性显示
|
2021-11-18 15:39:00 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
jiaoyangna
|
1e4a7a57be
|
法宝之魂 提交
|
2021-11-16 15:24:17 +08:00 |
jiaoyangna
|
8c9e1b7a2f
|
脚本初提
|
2021-11-11 16:48:15 +08:00 |